diff --git a/src/gui/panels/local_peer_panel.cpp b/src/gui/panels/local_peer_panel.cpp index 9c4ba73..bf2c1d6 100644 --- a/src/gui/panels/local_peer_panel.cpp +++ b/src/gui/panels/local_peer_panel.cpp @@ -17,7 +17,7 @@ int Render::LocalWindow() { ImGui::SetNextWindowPos(ImVec2(0.0f, io.DisplaySize.y * TITLE_BAR_HEIGHT), ImGuiCond_Always); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0, 0, 0, 0)); ImGui::BeginChild("LocalDesktopWindow", @@ -42,7 +42,7 @@ int Render::LocalWindow() { ImGuiCond_Always); ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(239.0f / 255, 240.0f / 255, 242.0f / 255, 1.0f)); - ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 10.0f); + ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, window_rounding_ * 1.5f); ImGui::BeginChild( "LocalDesktopPanel", ImVec2(local_window_width * 0.8f, local_window_height * 0.43f), @@ -101,7 +101,7 @@ int Render::LocalWindow() { ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f - (float)time_duration)); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); ImGui::Begin("ConnectionStatusWindow", nullptr, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings); @@ -177,10 +177,11 @@ int Render::LocalWindow() { ImGui::SetNextWindowSize( ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f)); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, + window_rounding_ * 0.5f); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0, 1.0, 1.0, 1.0)); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); ImGui::Begin("ResetPasswordWindow", nullptr, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | diff --git a/src/gui/panels/recent_connections_panel.cpp b/src/gui/panels/recent_connections_panel.cpp index 8530548..41b5d69 100644 --- a/src/gui/panels/recent_connections_panel.cpp +++ b/src/gui/panels/recent_connections_panel.cpp @@ -292,10 +292,10 @@ int Render::ConfirmDeleteConnection() { ImGui::SetNextWindowSize( ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f)); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); ImGui::Begin("ConfirmDeleteConnectionWindow", nullptr, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | @@ -346,10 +346,10 @@ int Render::OfflineWarningWindow() { ImGui::SetNextWindowSize( ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f)); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); ImGui::Begin("OfflineWarningWindow", nullptr, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | diff --git a/src/gui/panels/remote_peer_panel.cpp b/src/gui/panels/remote_peer_panel.cpp index 4423f8f..2230561 100644 --- a/src/gui/panels/remote_peer_panel.cpp +++ b/src/gui/panels/remote_peer_panel.cpp @@ -18,7 +18,7 @@ int Render::RemoteWindow() { ImGui::SetNextWindowPos( ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * TITLE_BAR_HEIGHT), ImGuiCond_Always); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0, 0, 0, 0)); ImGui::BeginChild("RemoteDesktopWindow", diff --git a/src/gui/render.cpp b/src/gui/render.cpp index 311bc64..0d6b4c1 100644 --- a/src/gui/render.cpp +++ b/src/gui/render.cpp @@ -938,6 +938,7 @@ int Render::CreateMainWindow() { (int)(server_window_width_default_ * dpi_scale_); server_window_normal_height_ = (int)(server_window_height_default_ * dpi_scale_); + window_rounding_ = window_rounding_default_ * dpi_scale_; SDL_SetWindowSize(main_window_, (int)main_window_width_, (int)main_window_height_); @@ -1297,7 +1298,7 @@ int Render::DrawMainWindow() { ImGuiIO& io = ImGui::GetIO(); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always); ImGui::SetNextWindowSize(ImVec2(io.DisplaySize.x, io.DisplaySize.y), diff --git a/src/gui/render.h b/src/gui/render.h index 3c1806c..992414c 100644 --- a/src/gui/render.h +++ b/src/gui/render.h @@ -543,6 +543,8 @@ class Render { int server_window_normal_height_ = 150; float server_window_dpi_scaling_w_ = 1.0f; float server_window_dpi_scaling_h_ = 1.0f; + float window_rounding_ = 6.0f; + float window_rounding_default_ = 6.0f; // server window collapsed mode bool server_window_collapsed_ = false; diff --git a/src/gui/toolbars/control_bar.cpp b/src/gui/toolbars/control_bar.cpp index efe20a7..82037f8 100644 --- a/src/gui/toolbars/control_bar.cpp +++ b/src/gui/toolbars/control_bar.cpp @@ -138,7 +138,7 @@ int Render::ControlBar(std::shared_ptr& props) { float line_padding = title_bar_height_ * 0.12f; float line_thickness = title_bar_height_ * 0.07f; - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); if (props->control_bar_expand_) { ImGui::SetCursorPosX(props->is_control_bar_in_left_ ? props->control_window_width_ * 0.03f diff --git a/src/gui/windows/about_window.cpp b/src/gui/windows/about_window.cpp index b5f4b8f..0e71d40 100644 --- a/src/gui/windows/about_window.cpp +++ b/src/gui/windows/about_window.cpp @@ -77,8 +77,8 @@ int Render::AboutWindow() { ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::SetWindowFontScale(0.5f); ImGui::Begin( localization::about[localization_language_index_].c_str(), nullptr, diff --git a/src/gui/windows/connection_status_window.cpp b/src/gui/windows/connection_status_window.cpp index a6876bb..00d42b9 100644 --- a/src/gui/windows/connection_status_window.cpp +++ b/src/gui/windows/connection_status_window.cpp @@ -15,10 +15,10 @@ bool Render::ConnectionStatusWindow( ImGui::SetNextWindowSize( ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f)); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); ImGui::Begin("ConnectionStatusWindow", nullptr, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | diff --git a/src/gui/windows/control_window.cpp b/src/gui/windows/control_window.cpp index 68620cb..361d72d 100644 --- a/src/gui/windows/control_window.cpp +++ b/src/gui/windows/control_window.cpp @@ -43,9 +43,9 @@ int Render::ControlWindow(std::shared_ptr& props) { } ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0)); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 10.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_ * 1.5f); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f); - ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 10.0f); + ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, window_rounding_ * 1.5f); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0)); float y_boundary = fullscreen_button_pressed_ ? 0.0f : title_bar_height_; diff --git a/src/gui/windows/file_transfer_window.cpp b/src/gui/windows/file_transfer_window.cpp index 6de9c53..b31a93b 100644 --- a/src/gui/windows/file_transfer_window.cpp +++ b/src/gui/windows/file_transfer_window.cpp @@ -94,7 +94,7 @@ int Render::FileTransferWindow( ImGui::PushFont(stream_windows_system_chinese_font_); } - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_ * 0.5f); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 0.9f)); ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f)); diff --git a/src/gui/windows/main_settings_window.cpp b/src/gui/windows/main_settings_window.cpp index e7a6314..6fa423c 100644 --- a/src/gui/windows/main_settings_window.cpp +++ b/src/gui/windows/main_settings_window.cpp @@ -50,8 +50,8 @@ int Render::SettingWindow() { int settings_items_offset = 0; ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::Begin(localization::settings[localization_language_index_].c_str(), nullptr, diff --git a/src/gui/windows/request_permission_window.mm b/src/gui/windows/request_permission_window.mm index 8f69114..3c79312 100644 --- a/src/gui/windows/request_permission_window.mm +++ b/src/gui/windows/request_permission_window.mm @@ -127,8 +127,8 @@ int Render::RequestPermissionWindow() { ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); ImGui::Begin( diff --git a/src/gui/windows/server_settings_window.cpp b/src/gui/windows/server_settings_window.cpp index 9e15803..ba94ab8 100644 --- a/src/gui/windows/server_settings_window.cpp +++ b/src/gui/windows/server_settings_window.cpp @@ -51,8 +51,8 @@ int Render::SelfHostedServerWindow() { { ImGui::SetWindowFontScale(0.5f); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::Begin(localization::self_hosted_server_settings [localization_language_index_] diff --git a/src/gui/windows/server_window.cpp b/src/gui/windows/server_window.cpp index d9042d6..6947dbc 100644 --- a/src/gui/windows/server_window.cpp +++ b/src/gui/windows/server_window.cpp @@ -49,7 +49,7 @@ int Render::ServerWindow() { ImGui::SetNextWindowSize(ImVec2(server_window_width_, server_window_height_), ImGuiCond_Always); ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); ImGui::Begin("##server_window", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoCollapse | @@ -61,7 +61,7 @@ int Render::ServerWindow() { ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 0.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0)); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always); ImGui::BeginChild( "ServerTitleBar", @@ -358,7 +358,7 @@ int Render::RemoteClientInfoWindow() { ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 0.0f, 0.0f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 0.3f, 0.3f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 0.5f, 0.5f, 1.0f)); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 5.0f); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_); ImGui::SetWindowFontScale(font_scale); if (ImGui::Button(ICON_FA_XMARK, ImVec2(close_connection_button_width, close_connection_button_height))) { diff --git a/src/gui/windows/update_notification_window.cpp b/src/gui/windows/update_notification_window.cpp index 535e7b9..baabb06 100644 --- a/src/gui/windows/update_notification_window.cpp +++ b/src/gui/windows/update_notification_window.cpp @@ -77,8 +77,8 @@ int Render::UpdateNotificationWindow() { ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f); - ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f); ImGui::Begin( localization::notification[localization_language_index_].c_str(), nullptr,