Compare commits

...

4 Commits

10 changed files with 231 additions and 209 deletions

View File

@@ -1,3 +1,4 @@
#include "layout_relative.h"
#include "localization.h" #include "localization.h"
#include "rd_log.h" #include "rd_log.h"
#include "render.h" #include "render.h"
@@ -5,25 +6,25 @@
namespace crossdesk { namespace crossdesk {
int Render::RecentConnectionsWindow() { int Render::RecentConnectionsWindow() {
ImGui::SetNextWindowPos( ImGuiIO& io = ImGui::GetIO();
ImVec2(0, title_bar_height_ + local_window_height_ - 1.0f), float recent_connection_window_width = io.DisplaySize.x;
float recent_connection_window_height =
io.DisplaySize.y * (0.46f - STATUS_BAR_HEIGHT);
ImGui::SetNextWindowPos(ImVec2(0, io.DisplaySize.y * 0.55f),
ImGuiCond_Always); ImGuiCond_Always);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
ImGui::BeginChild( ImGui::BeginChild(
"RecentConnectionsWindow", "RecentConnectionsWindow",
ImVec2(main_window_width_, main_window_height_ - title_bar_height_ - ImVec2(recent_connection_window_width, recent_connection_window_height),
local_window_height_ - status_bar_height_ +
1.0f),
ImGuiChildFlags_Border, ImGuiChildFlags_Border,
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
ImGuiWindowFlags_NoBringToFrontOnFocus); ImGuiWindowFlags_NoBringToFrontOnFocus);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
ImGui::PopStyleColor(); ImGui::PopStyleColor();
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + main_window_text_y_padding_); ImGui::SetCursorPos(
ImGui::Indent(main_child_window_x_padding_); ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.02f));
ImGui::TextColored( ImGui::TextColored(
ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s", ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s",
@@ -37,35 +38,40 @@ int Render::RecentConnectionsWindow() {
} }
int Render::ShowRecentConnections() { int Render::ShowRecentConnections() {
float recent_connection_window_padding = 25.0f * dpi_scale_; ImGuiIO& io = ImGui::GetIO();
float recent_connection_window_width = float recent_connection_panel_width = io.DisplaySize.x * 0.912f;
main_window_width_ - 2 * recent_connection_window_padding; float recent_connection_panel_height = io.DisplaySize.y * 0.29f;
ImGui::SetCursorPosX(recent_connection_window_padding); float recent_connection_image_height = recent_connection_panel_height * 0.6f;
ImVec2 sub_window_pos = ImGui::GetCursorPos(); float recent_connection_image_width = recent_connection_image_height * 16 / 9;
std::map<std::string, ImVec2> sub_containers_pos;
float recent_connection_sub_container_width = float recent_connection_sub_container_width =
recent_connection_image_width_ + 16.0f * dpi_scale_; recent_connection_image_width * 1.2f;
float recent_connection_sub_container_height = float recent_connection_sub_container_height =
recent_connection_image_height_ + 36.0f * dpi_scale_; recent_connection_image_height * 1.4f;
float recent_connection_button_width = recent_connection_image_width * 0.15f;
float recent_connection_button_height =
recent_connection_image_height * 0.25f;
float recent_connection_dummy_button_width =
recent_connection_image_width - 2 * recent_connection_button_width;
ImGui::SetCursorPos(
ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.1f));
std::map<std::string, ImVec2> sub_containers_pos;
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImGui::PushStyleColor(ImGuiCol_ChildBg,
ImVec4(239.0f / 255, 240.0f / 255, 242.0f / 255, 1.0f)); ImVec4(239.0f / 255, 240.0f / 255, 242.0f / 255, 1.0f));
ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 10.0f); ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 10.0f);
ImGui::BeginChild("RecentConnectionsContainer", ImGui::BeginChild(
ImVec2(recent_connection_window_width, "RecentConnectionsContainer",
recent_connection_sub_container_height * 1.1f), ImVec2(recent_connection_panel_width, recent_connection_panel_height),
ImGuiChildFlags_Border, ImGuiChildFlags_Border,
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoBringToFrontOnFocus |
ImGuiWindowFlags_AlwaysHorizontalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar |
ImGuiWindowFlags_NoScrollbar |
ImGuiWindowFlags_NoScrollWithMouse); ImGuiWindowFlags_NoScrollWithMouse);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
ImGui::PopStyleColor(); ImGui::PopStyleColor();
size_t recent_connections_count = recent_connections_.size(); size_t recent_connections_count = recent_connections_.size();
int count = 0; int count = 0;
float button_width = 22 * dpi_scale_;
float button_height = 22 * dpi_scale_;
for (auto& it : recent_connections_) { for (auto& it : recent_connections_) {
sub_containers_pos[it.first] = ImGui::GetCursorPos(); sub_containers_pos[it.first] = ImGui::GetCursorPos();
std::string recent_connection_sub_window_name = std::string recent_connection_sub_window_name =
@@ -75,11 +81,8 @@ int Render::ShowRecentConnections() {
ImVec2(recent_connection_sub_container_width, ImVec2(recent_connection_sub_container_width,
recent_connection_sub_container_height), recent_connection_sub_container_height),
ImGuiChildFlags_None, ImGuiChildFlags_None,
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus);
ImGuiWindowFlags_NoTitleBar |
ImGuiWindowFlags_NoBringToFrontOnFocus |
ImGuiWindowFlags_NoScrollbar);
std::string connection_info = it.first; std::string connection_info = it.first;
// remote id length is 9 // remote id length is 9
@@ -118,15 +121,16 @@ int Render::ShowRecentConnections() {
it.second.remote_host_name = "unknown"; it.second.remote_host_name = "unknown";
} }
ImVec2 image_screen_pos = ImVec2 image_screen_pos = ImVec2(
ImVec2(ImGui::GetCursorScreenPos().x + 5.0f * dpi_scale_, ImGui::GetCursorScreenPos().x + recent_connection_image_width * 0.04f,
ImGui::GetCursorScreenPos().y + 5.0f * dpi_scale_); ImGui::GetCursorScreenPos().y + recent_connection_image_height * 0.08f);
ImVec2 image_pos = ImVec2(ImGui::GetCursorPosX() + 5.0f * dpi_scale_, ImVec2 image_pos =
ImGui::GetCursorPosY() + 5.0f * dpi_scale_); ImVec2(ImGui::GetCursorPosX() + recent_connection_image_width * 0.05f,
ImGui::GetCursorPosY() + recent_connection_image_height * 0.08f);
ImGui::SetCursorPos(image_pos); ImGui::SetCursorPos(image_pos);
ImGui::Image((ImTextureID)(intptr_t)it.second.texture, ImGui::Image(
ImVec2((float)recent_connection_image_width_, (ImTextureID)(intptr_t)it.second.texture,
(float)recent_connection_image_height_)); ImVec2(recent_connection_image_width, recent_connection_image_height));
// remote id display button // remote id display button
{ {
@@ -135,16 +139,17 @@ int Render::ShowRecentConnections() {
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0, 0, 0, 0.2f)); ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0, 0, 0, 0.2f));
ImVec2 dummy_button_pos = ImVec2 dummy_button_pos =
ImVec2(image_pos.x, image_pos.y + recent_connection_image_height_); ImVec2(image_pos.x, image_pos.y + recent_connection_image_height);
std::string dummy_button_name = "##DummyButton" + it.second.remote_id; std::string dummy_button_name = "##DummyButton" + it.second.remote_id;
ImGui::SetCursorPos(dummy_button_pos); ImGui::SetCursorPos(dummy_button_pos);
ImGui::SetWindowFontScale(0.6f); ImGui::SetWindowFontScale(0.6f);
ImGui::Button(dummy_button_name.c_str(), ImGui::Button(dummy_button_name.c_str(),
ImVec2(recent_connection_image_width_ - 2 * button_width, ImVec2(recent_connection_dummy_button_width,
button_height)); recent_connection_button_height));
ImGui::SetWindowFontScale(1.0f); ImGui::SetWindowFontScale(1.0f);
ImGui::SetCursorPos( ImGui::SetCursorPos(ImVec2(
ImVec2(dummy_button_pos.x + 2.0f, dummy_button_pos.y + 1.0f)); dummy_button_pos.x + recent_connection_dummy_button_width * 0.05f,
dummy_button_pos.y + recent_connection_button_height * 0.05f));
ImGui::SetWindowFontScale(0.65f); ImGui::SetWindowFontScale(0.65f);
ImGui::Text("%s", it.second.remote_id.c_str()); ImGui::Text("%s", it.second.remote_id.c_str());
ImGui::SetWindowFontScale(1.0f); ImGui::SetWindowFontScale(1.0f);
@@ -167,16 +172,18 @@ int Render::ShowRecentConnections() {
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.5f);
// trash button // trash button
{ {
ImVec2 trash_can_button_pos = ImVec2( ImVec2 trash_can_button_pos =
image_pos.x + recent_connection_image_width_ - 2 * button_width, ImVec2(image_pos.x + recent_connection_image_width -
image_pos.y + recent_connection_image_height_); 2 * recent_connection_button_width,
image_pos.y + recent_connection_image_height);
ImGui::SetCursorPos(trash_can_button_pos); ImGui::SetCursorPos(trash_can_button_pos);
std::string trash_can = ICON_FA_TRASH_CAN; std::string trash_can = ICON_FA_TRASH_CAN;
std::string recent_connection_delete_button_name = std::string recent_connection_delete_button_name =
trash_can + "##RecentConnectionDelete" + trash_can + "##RecentConnectionDelete" +
std::to_string(trash_can_button_pos.x); std::to_string(trash_can_button_pos.x);
if (ImGui::Button(recent_connection_delete_button_name.c_str(), if (ImGui::Button(recent_connection_delete_button_name.c_str(),
ImVec2(button_width, button_height))) { ImVec2(recent_connection_button_width,
recent_connection_button_height))) {
show_confirm_delete_connection_ = true; show_confirm_delete_connection_ = true;
delete_connection_name_ = it.first; delete_connection_name_ = it.first;
} }
@@ -192,14 +199,16 @@ int Render::ShowRecentConnections() {
// connect button // connect button
{ {
ImVec2 connect_button_pos = ImVec2 connect_button_pos =
ImVec2(image_pos.x + recent_connection_image_width_ - button_width, ImVec2(image_pos.x + recent_connection_image_width -
image_pos.y + recent_connection_image_height_); recent_connection_button_width,
image_pos.y + recent_connection_image_height);
ImGui::SetCursorPos(connect_button_pos); ImGui::SetCursorPos(connect_button_pos);
std::string connect = ICON_FA_ARROW_RIGHT_LONG; std::string connect = ICON_FA_ARROW_RIGHT_LONG;
std::string connect_to_this_connection_button_name = std::string connect_to_this_connection_button_name =
connect + "##ConnectionTo" + it.first; connect + "##ConnectionTo" + it.first;
if (ImGui::Button(connect_to_this_connection_button_name.c_str(), if (ImGui::Button(connect_to_this_connection_button_name.c_str(),
ImVec2(button_width, button_height))) { ImVec2(recent_connection_button_width,
recent_connection_button_height))) {
ConnectTo(it.second.remote_id, it.second.password.c_str(), ConnectTo(it.second.remote_id, it.second.password.c_str(),
it.second.remember_password); it.second.remember_password);
} }
@@ -211,20 +220,20 @@ int Render::ShowRecentConnections() {
if (count != recent_connections_count - 1) { if (count != recent_connections_count - 1) {
ImVec2 line_start = ImVec2 line_start =
ImVec2(image_screen_pos.x + recent_connection_image_width_ + ImVec2(image_screen_pos.x + recent_connection_image_width * 1.19f,
20.0f * dpi_scale_,
image_screen_pos.y); image_screen_pos.y);
ImVec2 line_end = ImVec2( ImVec2 line_end =
image_screen_pos.x + recent_connection_image_width_ + ImVec2(image_screen_pos.x + recent_connection_image_width * 1.19f,
20.0f * dpi_scale_, image_screen_pos.y + recent_connection_image_height +
image_screen_pos.y + recent_connection_image_height_ + button_height); recent_connection_button_height);
ImGui::GetWindowDrawList()->AddLine(line_start, line_end, ImGui::GetWindowDrawList()->AddLine(line_start, line_end,
IM_COL32(0, 0, 0, 122), 1.0f); IM_COL32(0, 0, 0, 122), 1.0f);
} }
count++; count++;
ImGui::SameLine( ImGui::SameLine(0, count != recent_connections_count
0, count != recent_connections_count ? (25.0f * dpi_scale_) : 0.0f); ? (recent_connection_image_width * 0.165f)
: 0.0f);
} }
ImGui::EndChild(); ImGui::EndChild();
@@ -237,32 +246,30 @@ int Render::ShowRecentConnections() {
} }
int Render::ConfirmDeleteConnection() { int Render::ConfirmDeleteConnection() {
const ImGuiViewport* viewport = ImGui::GetMainViewport(); ImGuiIO& io = ImGui::GetIO();
ImGui::SetNextWindowPos(ImVec2((viewport->WorkSize.x - viewport->WorkPos.x - ImGui::SetNextWindowPos(
connection_status_window_width_) / ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
2, ImGui::SetNextWindowSize(
(viewport->WorkSize.y - viewport->WorkPos.y - ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
connection_status_window_height_) /
2));
ImGui::SetNextWindowSize(ImVec2(connection_status_window_width_,
connection_status_window_height_));
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0, 1.0, 1.0, 1.0)); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0, 1.0, 1.0, 1.0));
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
ImGui::Begin("ConfirmDeleteConnectionWindow", nullptr, ImGui::Begin("ConfirmDeleteConnectionWindow", nullptr,
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
ImGuiWindowFlags_NoSavedSettings); ImGuiWindowFlags_NoSavedSettings);
ImGui::PopStyleVar(2); ImGui::PopStyleVar(2);
ImGui::PopStyleColor(); ImGui::PopStyleColor();
auto connection_status_window_width = ImGui::GetWindowSize().x;
auto connection_status_window_height = ImGui::GetWindowSize().y;
std::string text = std::string text =
localization::confirm_delete_connection[localization_language_index_]; localization::confirm_delete_connection[localization_language_index_];
ImGui::SetCursorPosX(connection_status_window_width_ * 6 / 19); ImGui::SetCursorPosX(connection_status_window_width * 0.33f);
ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3); ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
// ok // ok
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.5f);
@@ -281,12 +288,9 @@ int Render::ConfirmDeleteConnection() {
show_confirm_delete_connection_ = false; show_confirm_delete_connection_ = false;
} }
auto window_width = ImGui::GetWindowSize().x;
auto window_height = ImGui::GetWindowSize().y;
auto text_width = ImGui::CalcTextSize(text.c_str()).x; auto text_width = ImGui::CalcTextSize(text.c_str()).x;
ImGui::SetCursorPosX((window_width - text_width) * 0.5f); ImGui::SetCursorPosX((connection_status_window_width - text_width) * 0.5f);
ImGui::SetCursorPosY(window_height * 0.2f); ImGui::SetCursorPosY(connection_status_window_height * 0.2f);
ImGui::Text("%s", text.c_str()); ImGui::Text("%s", text.c_str());
ImGui::SetWindowFontScale(1.0f); ImGui::SetWindowFontScale(1.0f);

View File

@@ -12,8 +12,8 @@ int Render::RemoteWindow() {
float remote_window_width = io.DisplaySize.x * 0.5f; float remote_window_width = io.DisplaySize.x * 0.5f;
float remote_window_height = float remote_window_height =
io.DisplaySize.y * (1 - TITLE_BAR_HEIGHT - STATUS_BAR_HEIGHT); io.DisplaySize.y * (1 - TITLE_BAR_HEIGHT - STATUS_BAR_HEIGHT);
float remote_window_button_width = io.DisplaySize.x * 0.046f; float remote_window_arrow_button_width = io.DisplaySize.x * 0.1f;
float remote_window_button_height = io.DisplaySize.y * 0.075f; float remote_window_arrow_button_height = io.DisplaySize.y * 0.078f;
ImGui::SetNextWindowPos( ImGui::SetNextWindowPos(
ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * TITLE_BAR_HEIGHT), ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * TITLE_BAR_HEIGHT),
@@ -29,7 +29,7 @@ int Render::RemoteWindow() {
ImGui::PopStyleColor(); ImGui::PopStyleColor();
ImGui::SetCursorPos( ImGui::SetCursorPos(
ImVec2(io.DisplaySize.x * 0.545f, io.DisplaySize.y * 0.02f)); ImVec2(io.DisplaySize.x * 0.057f, io.DisplaySize.y * 0.02f));
ImGui::TextColored( ImGui::TextColored(
ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s", ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s",
@@ -38,7 +38,7 @@ int Render::RemoteWindow() {
ImGui::Spacing(); ImGui::Spacing();
{ {
ImGui::SetNextWindowPos( ImGui::SetNextWindowPos(
ImVec2(io.DisplaySize.x * 0.56f, io.DisplaySize.y * 0.15f), ImVec2(io.DisplaySize.x * 0.557f, io.DisplaySize.y * 0.15f),
ImGuiCond_Always); ImGuiCond_Always);
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(239.0f / 255, 240.0f / 255, ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(239.0f / 255, 240.0f / 255,
242.0f / 255, 1.0f)); 242.0f / 255, 1.0f));
@@ -58,7 +58,7 @@ int Render::RemoteWindow() {
"%s", localization::remote_id[localization_language_index_].c_str()); "%s", localization::remote_id[localization_language_index_].c_str());
ImGui::Spacing(); ImGui::Spacing();
ImGui::SetNextItemWidth(IPUT_WINDOW_WIDTH); ImGui::SetNextItemWidth(io.DisplaySize.x * 0.25f);
ImGui::SetWindowFontScale(1.0f); ImGui::SetWindowFontScale(1.0f);
ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f); ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
if (re_enter_remote_id_) { if (re_enter_remote_id_) {
@@ -81,7 +81,8 @@ int Render::RemoteWindow() {
static_cast<int (*)(int)>(&isspace)), static_cast<int (*)(int)>(&isspace)),
remote_id.end()); remote_id.end());
if (ImGui::Button(ICON_FA_ARROW_RIGHT_LONG, if (ImGui::Button(ICON_FA_ARROW_RIGHT_LONG,
ImVec2(55 * dpi_scale_, 38 * dpi_scale_)) || ImVec2(remote_window_arrow_button_width,
remote_window_arrow_button_height)) ||
enter_pressed) { enter_pressed) {
connect_button_pressed_ = true; connect_button_pressed_ = true;
bool found = false; bool found = false;
@@ -187,20 +188,13 @@ int Render::ConnectTo(const std::string& remote_id, const char* password,
memcpy(&props->params_, &params_, sizeof(Params)); memcpy(&props->params_, &params_, sizeof(Params));
props->params_.user_id = props->local_id_.c_str(); props->params_.user_id = props->local_id_.c_str();
props->peer_ = CreatePeer(&props->params_); props->peer_ = CreatePeer(&props->params_);
props->control_window_min_width_ =
props->control_window_min_width_ * dpi_scale_; props->control_window_width_ = title_bar_button_height_ * 7.5f;
props->control_window_min_height_ = props->control_window_height_ = title_bar_button_height_ * 1.16f;
props->control_window_min_height_ * dpi_scale_; props->control_window_min_width_ = title_bar_button_height_ * 0.65f;
props->control_window_max_width_ = props->control_window_min_height_ = title_bar_button_height_ * 1.16f;
props->control_window_max_width_ * dpi_scale_; props->control_window_max_width_ = title_bar_button_height_ * 7.5f;
props->control_window_max_height_ = props->control_window_max_height_ = title_bar_button_height_ * 6.0f;
props->control_window_max_height_ * dpi_scale_;
props->control_window_width_ =
props->control_window_width_ * dpi_scale_;
props->control_window_height_ =
props->control_window_height_ * dpi_scale_;
// props->control_bar_pos_x_ = props->control_bar_pos_x_ * dpi_scale_;
// props->control_bar_pos_y_ = props->control_bar_pos_y_ * dpi_scale_;
if (!props->peer_) { if (!props->peer_) {
LOG_INFO("Create peer [{}] instance failed", props->local_id_); LOG_INFO("Create peer [{}] instance failed", props->local_id_);

View File

@@ -11,7 +11,7 @@
#include "device_controller_factory.h" #include "device_controller_factory.h"
#include "fa_regular_400.h" #include "fa_regular_400.h"
#include "fa_solid_900.h" #include "fa_solid_900.h"
#include "layout.h" #include "layout_relative.h"
#include "localization.h" #include "localization.h"
#include "platform.h" #include "platform.h"
#include "rd_log.h" #include "rd_log.h"
@@ -969,10 +969,11 @@ int Render::DrawStreamWindow() {
StreamWindow(); StreamWindow();
if (!fullscreen_button_pressed_) { if (!fullscreen_button_pressed_) {
ImGuiIO& io = ImGui::GetIO();
ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always); ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
ImGui::SetNextWindowSize( ImGui::SetNextWindowSize(
ImVec2(stream_window_width_, ImVec2(io.DisplaySize.x,
fullscreen_button_pressed_ ? 0 : title_bar_height_), fullscreen_button_pressed_ ? 0 : title_bar_button_height_),
ImGuiCond_Always); ImGuiCond_Always);
ImGui::Begin("StreamWindowTitleBar", nullptr, ImGui::Begin("StreamWindowTitleBar", nullptr,
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration |

View File

@@ -294,6 +294,8 @@ class Render {
/* ------ all windows property start ------ */ /* ------ all windows property start ------ */
float title_bar_width_ = 640; float title_bar_width_ = 640;
float title_bar_height_ = 30; float title_bar_height_ = 30;
float title_bar_button_width_ = 30;
float title_bar_button_height_ = 30;
/* ------ all windows property end ------ */ /* ------ all windows property end ------ */
/* ------ main window property start ------ */ /* ------ main window property start ------ */

View File

@@ -32,32 +32,29 @@ int LossRateDisplay(float loss_rate) {
} }
int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) { int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f * dpi_scale_); float button_width = title_bar_button_height_ * 0.8f;
float button_height = title_bar_button_height_ * 0.8f;
float line_padding = title_bar_button_height_ * 0.12f;
float line_thickness = title_bar_button_height_ * 0.07f;
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
if (props->control_bar_expand_) { if (props->control_bar_expand_) {
float button_width = 24.0f * dpi_scale_; ImGui::SetCursorPosX(props->is_control_bar_in_left_
float button_height = 24.0f * dpi_scale_; ? props->control_window_width_ * 1.02f
float line_padding = 4.0f * dpi_scale_; : props->control_window_width_ * 0.23f);
ImGui::SetCursorPosX(
props->is_control_bar_in_left_
? (props->control_window_width_ + 5.0f * dpi_scale_)
: 50.0f * dpi_scale_);
// mouse control button
ImDrawList* draw_list = ImGui::GetWindowDrawList(); ImDrawList* draw_list = ImGui::GetWindowDrawList();
if (!props->is_control_bar_in_left_) {
if (props->is_control_bar_in_left_) {
draw_list->AddLine( draw_list->AddLine(
ImVec2(ImGui::GetCursorScreenPos().x - 5.0f * dpi_scale_, ImVec2(ImGui::GetCursorScreenPos().x - button_height * 0.48f,
ImGui::GetCursorScreenPos().y - 7.0f * dpi_scale_), ImGui::GetCursorScreenPos().y + button_height * 0.2f),
ImVec2(ImGui::GetCursorScreenPos().x - 5.0f * dpi_scale_, ImVec2(ImGui::GetCursorScreenPos().x - button_height * 0.48f,
ImGui::GetCursorScreenPos().y - 7.0f * dpi_scale_ + ImGui::GetCursorScreenPos().y + button_height * 0.8f),
props->control_window_height_), IM_COL32(178, 178, 178, 255), 2.0f);
IM_COL32(178, 178, 178, 255), 1.0f);
} }
std::string display = ICON_FA_DISPLAY; std::string display = ICON_FA_DISPLAY;
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.8f);
if (ImGui::Button(display.c_str(), ImVec2(button_width, button_height))) { if (ImGui::Button(display.c_str(), ImVec2(button_width, button_height))) {
ImGui::OpenPopup("display"); ImGui::OpenPopup("display");
} }
@@ -66,7 +63,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
ImVec2 btn_size_actual = ImGui::GetItemRectSize(); ImVec2 btn_size_actual = ImGui::GetItemRectSize();
if (ImGui::BeginPopup("display")) { if (ImGui::BeginPopup("display")) {
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.8f);
for (int i = 0; i < props->display_info_list_.size(); i++) { for (int i = 0; i < props->display_info_list_.size(); i++) {
if (ImGui::Selectable(props->display_info_list_[i].name.c_str())) { if (ImGui::Selectable(props->display_info_list_[i].name.c_str())) {
props->selected_display_ = i; props->selected_display_ = i;
@@ -90,7 +87,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
std::to_string(props->selected_display_ + 1).c_str()); std::to_string(props->selected_display_ + 1).c_str());
ImVec2 text_pos = ImVec2 text_pos =
ImVec2(btn_min.x + (btn_size_actual.x - text_size.x) * 0.5f, ImVec2(btn_min.x + (btn_size_actual.x - text_size.x) * 0.5f,
btn_min.y + (btn_size_actual.y - text_size.y) * 0.5f - 2.0f); btn_min.y + (btn_size_actual.y - text_size.y) * 0.35f);
ImGui::GetWindowDrawList()->AddText( ImGui::GetWindowDrawList()->AddText(
text_pos, IM_COL32(0, 0, 0, 255), text_pos, IM_COL32(0, 0, 0, 255),
std::to_string(props->selected_display_ + 1).c_str()); std::to_string(props->selected_display_ + 1).c_str());
@@ -103,6 +100,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
std::string mouse = props->mouse_control_button_pressed_ std::string mouse = props->mouse_control_button_pressed_
? ICON_FA_COMPUTER_MOUSE ? ICON_FA_COMPUTER_MOUSE
: ICON_FA_COMPUTER_MOUSE; : ICON_FA_COMPUTER_MOUSE;
ImGui::SetWindowFontScale(0.8f);
if (ImGui::Button(mouse.c_str(), ImVec2(button_width, button_height))) { if (ImGui::Button(mouse.c_str(), ImVec2(button_width, button_height))) {
if (props->connection_established_) { if (props->connection_established_) {
start_keyboard_capturer_ = !start_keyboard_capturer_; start_keyboard_capturer_ = !start_keyboard_capturer_;
@@ -117,7 +115,6 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
} }
if (!props->mouse_control_button_pressed_) { if (!props->mouse_control_button_pressed_) {
float line_thickness = 2.0f * dpi_scale_;
draw_list->AddLine(ImVec2(disable_mouse_x, disable_mouse_y), draw_list->AddLine(ImVec2(disable_mouse_x, disable_mouse_y),
ImVec2(mouse_x + button_width - line_padding, ImVec2(mouse_x + button_width - line_padding,
mouse_y + button_height - line_padding), mouse_y + button_height - line_padding),
@@ -143,6 +140,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
std::string audio = props->audio_capture_button_pressed_ std::string audio = props->audio_capture_button_pressed_
? ICON_FA_VOLUME_HIGH ? ICON_FA_VOLUME_HIGH
: ICON_FA_VOLUME_HIGH; : ICON_FA_VOLUME_HIGH;
ImGui::SetWindowFontScale(0.8f);
if (ImGui::Button(audio.c_str(), ImVec2(button_width, button_height))) { if (ImGui::Button(audio.c_str(), ImVec2(button_width, button_height))) {
if (props->connection_established_) { if (props->connection_established_) {
props->audio_capture_button_pressed_ = props->audio_capture_button_pressed_ =
@@ -162,7 +160,6 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
} }
if (!props->audio_capture_button_pressed_) { if (!props->audio_capture_button_pressed_) {
float line_thickness = 2.0f * dpi_scale_;
draw_list->AddLine(ImVec2(disable_audio_x, disable_audio_y), draw_list->AddLine(ImVec2(disable_audio_x, disable_audio_y),
ImVec2(audio_x + button_width - line_padding, ImVec2(audio_x + button_width - line_padding,
audio_y + button_height - line_padding), audio_y + button_height - line_padding),
@@ -187,6 +184,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
button_color_style_pushed = true; button_color_style_pushed = true;
} }
std::string net_traffic_stats = ICON_FA_SIGNAL; std::string net_traffic_stats = ICON_FA_SIGNAL;
ImGui::SetWindowFontScale(0.8f);
if (ImGui::Button(net_traffic_stats.c_str(), if (ImGui::Button(net_traffic_stats.c_str(),
ImVec2(button_width, button_height))) { ImVec2(button_width, button_height))) {
props->net_traffic_stats_button_pressed_ = props->net_traffic_stats_button_pressed_ =
@@ -210,6 +208,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
// fullscreen button // fullscreen button
std::string fullscreen = std::string fullscreen =
fullscreen_button_pressed_ ? ICON_FA_COMPRESS : ICON_FA_EXPAND; fullscreen_button_pressed_ ? ICON_FA_COMPRESS : ICON_FA_EXPAND;
ImGui::SetWindowFontScale(0.8f);
if (ImGui::Button(fullscreen.c_str(), if (ImGui::Button(fullscreen.c_str(),
ImVec2(button_width, button_height))) { ImVec2(button_width, button_height))) {
fullscreen_button_pressed_ = !fullscreen_button_pressed_; fullscreen_button_pressed_ = !fullscreen_button_pressed_;
@@ -229,6 +228,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
ImGui::SameLine(); ImGui::SameLine();
// close button // close button
std::string close_button = ICON_FA_XMARK; std::string close_button = ICON_FA_XMARK;
ImGui::SetWindowFontScale(0.8f);
if (ImGui::Button(close_button.c_str(), if (ImGui::Button(close_button.c_str(),
ImVec2(button_width, button_height))) { ImVec2(button_width, button_height))) {
CleanupPeer(props); CleanupPeer(props);
@@ -236,20 +236,27 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
ImGui::SameLine(); ImGui::SameLine();
if (!props->is_control_bar_in_left_) { if (props->is_control_bar_in_left_) {
draw_list->AddLine(ImVec2(ImGui::GetCursorScreenPos().x - 3.0f, draw_list->AddLine(
ImGui::GetCursorScreenPos().y - 7.0f), ImVec2(ImGui::GetCursorScreenPos().x + button_height * 0.2f,
ImVec2(ImGui::GetCursorScreenPos().x - 3.0f, ImGui::GetCursorScreenPos().y + button_height * 0.2f),
ImGui::GetCursorScreenPos().y - 7.0f + ImVec2(ImGui::GetCursorScreenPos().x + button_height * 0.2f,
props->control_window_height_), ImGui::GetCursorScreenPos().y + button_height * 0.8f),
IM_COL32(178, 178, 178, 255), 1.0f); IM_COL32(178, 178, 178, 255), 2.0f);
}
} }
ImGui::SetCursorPosX( ImGui::SameLine();
props->is_control_bar_in_left_ }
? (props->control_window_width_ * 2 - 20.0f * dpi_scale_)
: 5.0f * dpi_scale_); float expand_button_pos_x =
props->control_bar_expand_ ? (props->is_control_bar_in_left_
? props->control_window_width_ * 1.9f
: props->control_window_width_ * 0.03f)
: (props->is_control_bar_in_left_
? props->control_window_width_ * 1.02f
: props->control_window_width_ * 0.23f);
ImGui::SetCursorPosX(expand_button_pos_x);
std::string control_bar = std::string control_bar =
props->control_bar_expand_ props->control_bar_expand_
@@ -258,13 +265,13 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
: (props->is_control_bar_in_left_ ? ICON_FA_ANGLE_RIGHT : (props->is_control_bar_in_left_ ? ICON_FA_ANGLE_RIGHT
: ICON_FA_ANGLE_LEFT); : ICON_FA_ANGLE_LEFT);
if (ImGui::Button(control_bar.c_str(), if (ImGui::Button(control_bar.c_str(),
ImVec2(15.0f * dpi_scale_, 25.0f * dpi_scale_))) { ImVec2(button_height * 0.6f, button_height))) {
props->control_bar_expand_ = !props->control_bar_expand_; props->control_bar_expand_ = !props->control_bar_expand_;
props->control_bar_button_pressed_time_ = ImGui::GetTime(); props->control_bar_button_pressed_time_ = ImGui::GetTime();
props->control_window_width_is_changing_ = true; props->control_window_width_is_changing_ = true;
if (!props->control_bar_expand_) { if (!props->control_bar_expand_) {
props->control_window_height_ = 35 * dpi_scale_; props->control_window_height_ = props->control_window_min_height_;
props->net_traffic_stats_button_pressed_ = false; props->net_traffic_stats_button_pressed_ = false;
} }
} }
@@ -280,12 +287,13 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
int Render::NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props) { int Render::NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props) {
ImGui::SetCursorPos(ImVec2(props->is_control_bar_in_left_ ImGui::SetCursorPos(ImVec2(props->is_control_bar_in_left_
? (props->control_window_width_ + 5.0f) ? props->control_window_width_ * 1.02f
: 5.0f, : props->control_window_width_ * 0.02f,
35.0f * dpi_scale_)); props->control_window_min_height_));
ImGui::SetWindowFontScale(0.8f);
if (ImGui::BeginTable("NetTrafficStats", 4, ImGuiTableFlags_BordersH, if (ImGui::BeginTable("NetTrafficStats", 4, ImGuiTableFlags_BordersH,
ImVec2(props->control_window_max_width_ - 10.0f, ImVec2(props->control_window_max_width_ * 0.9f,
props->control_window_max_height_ - 60.0f))) { props->control_window_max_height_ - 0.9f))) {
ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed); ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch); ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch); ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
@@ -344,9 +352,12 @@ int Render::NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props) {
ImGui::Text("FPS"); ImGui::Text("FPS");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("%d", props->fps_); ImGui::Text("%d", props->fps_);
ImGui::TableNextColumn();
ImGui::TableNextColumn();
ImGui::EndTable(); ImGui::EndTable();
} }
ImGui::SetWindowFontScale(1.0f);
return 0; return 0;
} }

View File

@@ -9,10 +9,24 @@ namespace crossdesk {
int Render::TitleBar(bool main_window) { int Render::TitleBar(bool main_window) {
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
float title_bar_width = io.DisplaySize.x; float title_bar_width = title_bar_width_;
float title_bar_height = io.DisplaySize.y * TITLE_BAR_HEIGHT; float title_bar_height = title_bar_height_;
float title_bar_button_width = io.DisplaySize.x * TITLE_BAR_BUTTON_WIDTH; float title_bar_button_width = title_bar_button_width_;
float title_bar_button_height = io.DisplaySize.y * TITLE_BAR_BUTTON_HEIGHT; float title_bar_button_height = title_bar_button_height_;
if (main_window) {
title_bar_width = io.DisplaySize.x;
title_bar_height = io.DisplaySize.y * (TITLE_BAR_HEIGHT + 0.01f);
title_bar_button_width = io.DisplaySize.x * TITLE_BAR_BUTTON_WIDTH;
title_bar_button_height = io.DisplaySize.y * TITLE_BAR_BUTTON_HEIGHT;
title_bar_height_ = title_bar_height;
title_bar_button_width_ = title_bar_button_width;
title_bar_button_height_ = title_bar_button_height;
} else {
title_bar_width = io.DisplaySize.x;
title_bar_height = title_bar_button_height_;
title_bar_button_width = title_bar_button_width_;
title_bar_button_height = title_bar_button_height_;
}
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
@@ -165,7 +179,7 @@ int Render::TitleBar(bool main_window) {
float minimize_pos_x = title_bar_width - float minimize_pos_x = title_bar_width -
title_bar_button_width * (main_window ? 2 : 3) + title_bar_button_width * (main_window ? 2 : 3) +
title_bar_button_width * 0.33f; title_bar_button_width * 0.33f;
float minimize_pos_y = title_bar_height * 0.5f; float minimize_pos_y = title_bar_button_height * 0.5f;
std::string window_minimize_button = "##minimize"; // ICON_FA_MINUS; std::string window_minimize_button = "##minimize"; // ICON_FA_MINUS;
if (ImGui::Button(window_minimize_button.c_str(), if (ImGui::Button(window_minimize_button.c_str(),
ImVec2(title_bar_button_width, title_bar_button_height))) { ImVec2(title_bar_button_width, title_bar_button_height))) {
@@ -185,7 +199,7 @@ int Render::TitleBar(bool main_window) {
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::PushStyleColor(ImGuiCol_ButtonActive,
ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
if (!window_maximized_) { if (window_maximized_) {
float pos_x_top = title_bar_width - title_bar_button_width * 1.65f; float pos_x_top = title_bar_width - title_bar_button_width * 1.65f;
float pos_y_top = title_bar_button_height * 0.36f; float pos_y_top = title_bar_button_height * 0.36f;
float pos_x_bottom = title_bar_width - title_bar_button_width * 1.6f; float pos_x_bottom = title_bar_width - title_bar_button_width * 1.6f;
@@ -249,7 +263,7 @@ int Render::TitleBar(bool main_window) {
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 0, 0, 0.5f)); ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 0, 0, 0.5f));
float xmark_pos_x = xmark_button_pos_x + title_bar_button_width * 0.5f; float xmark_pos_x = xmark_button_pos_x + title_bar_button_width * 0.5f;
float xmark_pos_y = title_bar_height * 0.5f; float xmark_pos_y = title_bar_button_height * 0.5f;
float xmark_size = title_bar_button_width * 0.33f; float xmark_size = title_bar_button_width * 0.33f;
std::string close_button = "##xmark"; // ICON_FA_XMARK; std::string close_button = "##xmark"; // ICON_FA_XMARK;
if (ImGui::Button(close_button.c_str(), if (ImGui::Button(close_button.c_str(),

View File

@@ -7,42 +7,39 @@ namespace crossdesk {
bool Render::ConnectionStatusWindow( bool Render::ConnectionStatusWindow(
std::shared_ptr<SubStreamWindowProperties>& props) { std::shared_ptr<SubStreamWindowProperties>& props) {
const ImGuiViewport* viewport = ImGui::GetMainViewport(); ImGuiIO& io = ImGui::GetIO();
bool ret_flag = false; bool ret_flag = false;
ImGui::SetNextWindowPos(ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
connection_status_window_width_) /
2,
(viewport->WorkSize.y - viewport->WorkPos.y -
connection_status_window_height_) /
2));
ImGui::SetNextWindowSize(ImVec2(connection_status_window_width_, ImGui::SetNextWindowPos(
connection_status_window_height_)); ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
ImGui::SetNextWindowSize(
ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0, 1.0, 1.0, 1.0));
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
ImGui::Begin("ConnectionStatusWindow", nullptr, ImGui::Begin("ConnectionStatusWindow", nullptr,
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
ImGuiWindowFlags_NoSavedSettings); ImGuiWindowFlags_NoSavedSettings);
ImGui::PopStyleVar(2); ImGui::PopStyleVar(2);
ImGui::PopStyleColor(); ImGui::PopStyleColor();
auto connection_status_window_width = ImGui::GetWindowSize().x;
auto connection_status_window_height = ImGui::GetWindowSize().y;
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.5f);
std::string text; std::string text;
if (ConnectionStatus::Connecting == props->connection_status_) { if (ConnectionStatus::Connecting == props->connection_status_) {
text = localization::p2p_connecting[localization_language_index_]; text = localization::p2p_connecting[localization_language_index_];
ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7); ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3); ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
} else if (ConnectionStatus::Connected == props->connection_status_) { } else if (ConnectionStatus::Connected == props->connection_status_) {
text = localization::p2p_connected[localization_language_index_]; text = localization::p2p_connected[localization_language_index_];
ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7); ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3); ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
// ok // ok
if (ImGui::Button(localization::ok[localization_language_index_].c_str()) || if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_Enter) ||
@@ -51,8 +48,8 @@ bool Render::ConnectionStatusWindow(
} }
} else if (ConnectionStatus::Disconnected == props->connection_status_) { } else if (ConnectionStatus::Disconnected == props->connection_status_) {
text = localization::p2p_disconnected[localization_language_index_]; text = localization::p2p_disconnected[localization_language_index_];
ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7); ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3); ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
// ok // ok
if (ImGui::Button(localization::ok[localization_language_index_].c_str()) || if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_Enter) ||
@@ -61,8 +58,8 @@ bool Render::ConnectionStatusWindow(
} }
} else if (ConnectionStatus::Failed == props->connection_status_) { } else if (ConnectionStatus::Failed == props->connection_status_) {
text = localization::p2p_failed[localization_language_index_]; text = localization::p2p_failed[localization_language_index_];
ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7); ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3); ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
// ok // ok
if (ImGui::Button(localization::ok[localization_language_index_].c_str()) || if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_Enter) ||
@@ -71,8 +68,8 @@ bool Render::ConnectionStatusWindow(
} }
} else if (ConnectionStatus::Closed == props->connection_status_) { } else if (ConnectionStatus::Closed == props->connection_status_) {
text = localization::p2p_closed[localization_language_index_]; text = localization::p2p_closed[localization_language_index_];
ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7); ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3); ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
// ok // ok
if (ImGui::Button(localization::ok[localization_language_index_].c_str()) || if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_Enter) ||
@@ -87,11 +84,9 @@ bool Render::ConnectionStatusWindow(
text = localization::reinput_password[localization_language_index_]; text = localization::reinput_password[localization_language_index_];
} }
auto window_width = ImGui::GetWindowSize().x; ImGui::SetCursorPosX(connection_status_window_width * 0.336f);
auto window_height = ImGui::GetWindowSize().y; ImGui::SetCursorPosY(connection_status_window_height * 0.4f);
ImGui::SetCursorPosX((window_width - IPUT_WINDOW_WIDTH / 2) * 0.5f); ImGui::SetNextItemWidth(connection_status_window_width * 0.33f);
ImGui::SetCursorPosY(window_height * 0.4f);
ImGui::SetNextItemWidth(IPUT_WINDOW_WIDTH / 2);
ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f); ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
@@ -109,15 +104,16 @@ bool Render::ConnectionStatusWindow(
ImVec2 text_size = ImGui::CalcTextSize( ImVec2 text_size = ImGui::CalcTextSize(
localization::remember_password[localization_language_index_] localization::remember_password[localization_language_index_]
.c_str()); .c_str());
ImGui::SetCursorPosX((window_width - text_size.x) * 0.5f - 13.0f); ImGui::SetCursorPosX((connection_status_window_width - text_size.x) *
0.45f);
ImGui::Checkbox( ImGui::Checkbox(
localization::remember_password[localization_language_index_].c_str(), localization::remember_password[localization_language_index_].c_str(),
&(props->remember_password_)); &(props->remember_password_));
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.5f);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
ImGui::SetCursorPosX(window_width * 0.315f); ImGui::SetCursorPosX(connection_status_window_width * 0.325f);
ImGui::SetCursorPosY(window_height * 0.75f); ImGui::SetCursorPosY(connection_status_window_height * 0.75f);
// ok // ok
if (ImGui::Button( if (ImGui::Button(
localization::ok[localization_language_index_].c_str()) || localization::ok[localization_language_index_].c_str()) ||
@@ -140,14 +136,14 @@ bool Render::ConnectionStatusWindow(
} }
} else if (password_validating_) { } else if (password_validating_) {
text = localization::validate_password[localization_language_index_]; text = localization::validate_password[localization_language_index_];
ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7); ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3); ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
} }
} else if (ConnectionStatus::NoSuchTransmissionId == } else if (ConnectionStatus::NoSuchTransmissionId ==
props->connection_status_) { props->connection_status_) {
text = localization::no_such_id[localization_language_index_]; text = localization::no_such_id[localization_language_index_];
ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7); ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3); ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
// ok // ok
if (ImGui::Button(localization::ok[localization_language_index_].c_str()) || if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
ImGui::IsKeyPressed(ImGuiKey_Enter)) { ImGui::IsKeyPressed(ImGuiKey_Enter)) {
@@ -158,11 +154,9 @@ bool Render::ConnectionStatusWindow(
} }
} }
auto window_width = ImGui::GetWindowSize().x;
auto window_height = ImGui::GetWindowSize().y;
auto text_width = ImGui::CalcTextSize(text.c_str()).x; auto text_width = ImGui::CalcTextSize(text.c_str()).x;
ImGui::SetCursorPosX((window_width - text_width) * 0.5f); ImGui::SetCursorPosX((connection_status_window_width - text_width) * 0.5f);
ImGui::SetCursorPosY(window_height * 0.2f); ImGui::SetCursorPosY(connection_status_window_height * 0.2f);
ImGui::Text("%s", text.c_str()); ImGui::Text("%s", text.c_str());
ImGui::SetWindowFontScale(1.0f); ImGui::SetWindowFontScale(1.0f);

View File

@@ -53,11 +53,11 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
ImVec2(props->control_window_width_, props->control_window_height_), ImVec2(props->control_window_width_, props->control_window_height_),
ImGuiCond_Always); ImGuiCond_Always);
ImGui::SetNextWindowPos(ImVec2(0, title_bar_height_ + 1), ImGuiCond_Once); ImGui::SetNextWindowPos(ImVec2(0, title_bar_height_), ImGuiCond_Once);
float pos_x = 0; float pos_x = 0;
float pos_y = 0; float pos_y = 0;
float y_boundary = fullscreen_button_pressed_ ? 0 : (title_bar_height_ + 1); float y_boundary = fullscreen_button_pressed_ ? 0 : title_bar_height_;
if (props->reset_control_bar_pos_) { if (props->reset_control_bar_pos_) {
float new_cursor_pos_x = 0; float new_cursor_pos_x = 0;
@@ -94,7 +94,7 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
} else if (!props->reset_control_bar_pos_ && } else if (!props->reset_control_bar_pos_ &&
ImGui::IsMouseReleased(ImGuiMouseButton_Left) || ImGui::IsMouseReleased(ImGuiMouseButton_Left) ||
props->control_window_width_is_changing_) { props->control_window_width_is_changing_) {
if (props->control_window_pos_.x <= stream_window_width_ / 2) { if (props->control_window_pos_.x <= stream_window_width_ * 0.5f) {
if (props->control_window_pos_.y + props->control_window_height_ > if (props->control_window_pos_.y + props->control_window_height_ >
stream_window_height_) { stream_window_height_) {
pos_y = stream_window_height_ - props->control_window_height_; pos_y = stream_window_height_ - props->control_window_height_;
@@ -118,18 +118,16 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
} }
} }
props->is_control_bar_in_left_ = true; props->is_control_bar_in_left_ = true;
} else if (props->control_window_pos_.x > stream_window_width_ / 2) { } else if (props->control_window_pos_.x > stream_window_width_ * 0.5f) {
pos_x = 0; pos_x = 0;
pos_y = pos_y =
(props->control_window_pos_.y >= y_boundary && (props->control_window_pos_.y >= y_boundary &&
props->control_window_pos_.y <= props->control_window_pos_.y <=
stream_window_height_ - props->control_window_height_) stream_window_height_ - props->control_window_height_)
? props->control_window_pos_.y ? props->control_window_pos_.y
: (props->control_window_pos_.y < (fullscreen_button_pressed_ : (props->control_window_pos_.y <
? 0 (fullscreen_button_pressed_ ? 0 : title_bar_height_)
: (title_bar_height_ + 1)) ? (fullscreen_button_pressed_ ? 0 : title_bar_height_)
? (fullscreen_button_pressed_ ? 0
: (title_bar_height_ + 1))
: (stream_window_height_ - props->control_window_height_)); : (stream_window_height_ - props->control_window_height_));
if (props->control_bar_expand_) { if (props->control_bar_expand_) {
@@ -205,9 +203,9 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
std::string control_child_window_title = std::string control_child_window_title =
props->remote_id_ + "ControlChildWindow"; props->remote_id_ + "ControlChildWindow";
ImGui::BeginChild( ImGui::BeginChild(control_child_window_title.c_str(),
control_child_window_title.c_str(), ImVec2(props->control_window_width_ * 2.0f,
ImVec2(props->control_window_width_ * 2, props->control_window_height_), props->control_window_height_),
ImGuiChildFlags_Border, ImGuiWindowFlags_NoDecoration); ImGuiChildFlags_Border, ImGuiWindowFlags_NoDecoration);
ImGui::PopStyleColor(); ImGui::PopStyleColor();

View File

@@ -9,9 +9,9 @@ int Render::MainWindow() {
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
float local_remote_window_width = io.DisplaySize.x; float local_remote_window_width = io.DisplaySize.x;
float local_remote_window_height = float local_remote_window_height =
io.DisplaySize.y * (1 - TITLE_BAR_HEIGHT - STATUS_BAR_HEIGHT); io.DisplaySize.y * (0.56f - TITLE_BAR_HEIGHT);
ImGui::SetNextWindowPos(ImVec2(0.0f, io.DisplaySize.y * TITLE_BAR_HEIGHT), ImGui::SetNextWindowPos(ImVec2(0.0f, io.DisplaySize.y * (TITLE_BAR_HEIGHT)),
ImGuiCond_Always); ImGuiCond_Always);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
@@ -34,7 +34,7 @@ int Render::MainWindow() {
RemoteWindow(); RemoteWindow();
ImGui::EndChild(); ImGui::EndChild();
// RecentConnectionsWindow(); RecentConnectionsWindow();
StatusBar(); StatusBar();
if (show_connection_status_window_) { if (show_connection_status_window_) {

View File

@@ -69,9 +69,13 @@ int Render::StreamWindow() {
ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoMove; ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoMove;
if (!fullscreen_button_pressed_) { if (!fullscreen_button_pressed_) {
ImGui::SetNextWindowPos(ImVec2(20.0f * dpi_scale_, 0), ImGuiCond_Always); ImGui::SetNextWindowPos(
ImGui::SetNextWindowSize(ImVec2(0, 30.0f * dpi_scale_), ImGuiCond_Always); ImVec2(title_bar_height_ * 0.2f, title_bar_height_ * 0.2f),
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 8.0f)); ImGuiCond_Always);
ImGui::SetNextWindowSize(
ImVec2(title_bar_height_ * 4.0f, title_bar_height_ * 0.8f),
ImGuiCond_Always);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0.0f)); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0.0f));
ImGui::Begin("TabBar", nullptr, ImGui::Begin("TabBar", nullptr,