[fix] resolve tab bar dragging issue

src/gui/panels/recent_connections_panel.cpp

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

src/gui/panels/remote_peer_panel.cpp

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

src/gui/render.cpp

@@ -6,12 +6,13 @@
 #include <fstream>
 #include <iostream>
 #include <string>
+#include <thread>
 
 #include "OPPOSans_Regular.h"
 #include "device_controller_factory.h"
 #include "fa_regular_400.h"
 #include "fa_solid_900.h"
-#include "layout.h"
+#include "layout_relative.h"
 #include "localization.h"
 #include "platform.h"
 #include "rd_log.h"
@@ -20,8 +21,6 @@
 
 #define NV12_BUFFER_SIZE 1280 * 720 * 3 / 2
 
-#define MOUSE_GRAB_PADDING 5
-
 namespace crossdesk {
 
 std::vector<char> Render::SerializeRemoteAction(const RemoteAction& action) {
@@ -133,9 +132,39 @@ SDL_HitTestResult Render::HitTestCallback(SDL_Window* window,
   int window_width, window_height;
   SDL_GetWindowSize(window, &window_width, &window_height);
 
-  if (area->y < 30 * render->dpi_scale_ && area->y > MOUSE_GRAB_PADDING &&
-      area->x < window_width - 120 * render->dpi_scale_ &&
-      area->x > MOUSE_GRAB_PADDING && !render->is_tab_bar_hovered_) {
+  // check if curosor is in tab bar
+  if (render->stream_window_inited_ && render->stream_window_created_ &&
+      !render->fullscreen_button_pressed_ && render->stream_ctx_) {
+    ImGuiContext* prev_ctx = ImGui::GetCurrentContext();
+    ImGui::SetCurrentContext(render->stream_ctx_);
+
+    ImGuiWindow* tab_bar_window = ImGui::FindWindowByName("TabBar");
+    if (tab_bar_window && tab_bar_window->Active) {
+      ImGuiIO& io = ImGui::GetIO();
+      float scale_x = io.DisplayFramebufferScale.x;
+      float scale_y = io.DisplayFramebufferScale.y;
+
+      float tab_bar_x = tab_bar_window->Pos.x * scale_x;
+      float tab_bar_y = tab_bar_window->Pos.y * scale_y;
+      float tab_bar_width = tab_bar_window->Size.x * scale_x;
+      float tab_bar_height = tab_bar_window->Size.y * scale_y;
+
+      ImGui::SetCurrentContext(prev_ctx);
+
+      if (area->x >= tab_bar_x && area->x <= tab_bar_x + tab_bar_width &&
+          area->y >= tab_bar_y && area->y <= tab_bar_y + tab_bar_height) {
+        return SDL_HITTEST_NORMAL;
+      }
+    } else {
+      ImGui::SetCurrentContext(prev_ctx);
+    }
+  }
+
+  float mouse_grab_padding = render->title_bar_button_width_ * 0.16f;
+  if (area->y < render->title_bar_button_width_ &&
+      area->y > mouse_grab_padding &&
+      area->x < window_width - render->title_bar_button_width_ * 4.0f &&
+      area->x > mouse_grab_padding) {
     return SDL_HITTEST_DRAGGABLE;
   }
 
@@ -143,25 +172,25 @@ SDL_HitTestResult Render::HitTestCallback(SDL_Window* window,
   //   return SDL_HITTEST_NORMAL;
   // }
 
-  if (area->y < MOUSE_GRAB_PADDING) {
-    if (area->x < MOUSE_GRAB_PADDING) {
+  if (area->y < mouse_grab_padding) {
+    if (area->x < mouse_grab_padding) {
       return SDL_HITTEST_RESIZE_TOPLEFT;
-    } else if (area->x > window_width - MOUSE_GRAB_PADDING) {
+    } else if (area->x > window_width - mouse_grab_padding) {
       return SDL_HITTEST_RESIZE_TOPRIGHT;
     } else {
       return SDL_HITTEST_RESIZE_TOP;
     }
-  } else if (area->y > window_height - MOUSE_GRAB_PADDING) {
-    if (area->x < MOUSE_GRAB_PADDING) {
+  } else if (area->y > window_height - mouse_grab_padding) {
+    if (area->x < mouse_grab_padding) {
       return SDL_HITTEST_RESIZE_BOTTOMLEFT;
-    } else if (area->x > window_width - MOUSE_GRAB_PADDING) {
+    } else if (area->x > window_width - mouse_grab_padding) {
       return SDL_HITTEST_RESIZE_BOTTOMRIGHT;
     } else {
       return SDL_HITTEST_RESIZE_BOTTOM;
     }
-  } else if (area->x < MOUSE_GRAB_PADDING) {
+  } else if (area->x < mouse_grab_padding) {
     return SDL_HITTEST_RESIZE_LEFT;
-  } else if (area->x > window_width - MOUSE_GRAB_PADDING) {
+  } else if (area->x > window_width - mouse_grab_padding) {
     return SDL_HITTEST_RESIZE_RIGHT;
   }
 
@@ -207,7 +236,7 @@ int Render::LoadSettingsFromCacheFile() {
     memset(aes128_iv_, 0, sizeof(aes128_iv_));
 
     thumbnail_.reset();
-    thumbnail_ = std::make_unique<Thumbnail>(cache_path_ + "/thumbnails/");
+    thumbnail_ = std::make_shared<Thumbnail>(cache_path_ + "/thumbnails/");
     thumbnail_->GetKeyAndIv(aes128_key_, aes128_iv_);
     thumbnail_->DeleteAllFilesInDirectory();
 
@@ -248,7 +277,7 @@ int Render::LoadSettingsFromCacheFile() {
   memcpy(aes128_iv_, cd_cache_.iv, sizeof(cd_cache_.iv));
 
   thumbnail_.reset();
-  thumbnail_ = std::make_unique<Thumbnail>(cache_path_ + "/thumbnails/",
+  thumbnail_ = std::make_shared<Thumbnail>(cache_path_ + "/thumbnails/",
                                            aes128_key_, aes128_iv_);
 
   language_button_value_ = (int)config_center_->GetLanguage();
@@ -605,53 +634,6 @@ void Render::UpdateInteractions() {
   }
 }
 
-int Render::UpdateWindowSizeWithDpiScale(float dpi_scale) {
-  main_window_width_ = (int)(main_window_width_default_ * dpi_scale);
-  main_window_height_ = (int)(main_window_height_default_ * dpi_scale);
-  stream_window_width_ = (int)(stream_window_width_default_ * dpi_scale);
-  stream_window_height_ = (int)(stream_window_height_default_ * dpi_scale);
-
-  local_window_width_ = (int)(local_window_width_ * dpi_scale);
-  local_window_height_ = (int)(local_window_height_ * dpi_scale);
-  remote_window_width_ = (int)(remote_window_width_ * dpi_scale);
-  remote_window_height_ = (int)(remote_window_height_ * dpi_scale);
-  local_child_window_width_ = (int)(local_child_window_width_ * dpi_scale);
-  local_child_window_height_ = (int)(local_child_window_height_ * dpi_scale);
-  remote_child_window_width_ = (int)(remote_child_window_width_ * dpi_scale);
-  remote_child_window_height_ = (int)(remote_child_window_height_ * dpi_scale);
-  main_window_text_y_padding_ = (int)(main_window_text_y_padding_ * dpi_scale);
-  main_child_window_x_padding_ =
-      (int)(main_child_window_x_padding_ * dpi_scale);
-  main_child_window_y_padding_ =
-      (int)(main_child_window_y_padding_ * dpi_scale);
-  title_bar_width_ = (int)(title_bar_width_ * dpi_scale);
-  title_bar_height_ = (int)(title_bar_height_ * dpi_scale);
-  status_bar_height_ = (int)(status_bar_height_ * dpi_scale);
-  connection_status_window_width_ =
-      (int)(connection_status_window_width_ * dpi_scale);
-  connection_status_window_height_ =
-      (int)(connection_status_window_height_ * dpi_scale);
-  notification_window_width_ = (int)(notification_window_width_ * dpi_scale);
-  notification_window_height_ = (int)(notification_window_height_ * dpi_scale);
-  about_window_width_ = (int)(about_window_width_ * dpi_scale);
-  about_window_height_ = (int)(about_window_height_ * dpi_scale);
-  update_notification_window_width_ =
-      (int)(update_notification_window_width_ * dpi_scale);
-  update_notification_window_height_ =
-      (int)(update_notification_window_height_ * dpi_scale);
-
-  recent_connection_image_width_ =
-      (int)(recent_connection_image_width_ * dpi_scale);
-  recent_connection_image_height_ =
-      (int)(recent_connection_image_height_ * dpi_scale);
-
-  if (thumbnail_) {
-    thumbnail_->SetThumbnailDpiScale(dpi_scale);
-  }
-
-  return 0;
-}
-
 int Render::CreateMainWindow() {
   main_ctx_ = ImGui::CreateContext();
   if (!main_ctx_) {
@@ -759,6 +741,10 @@ int Render::CreateStreamWindow() {
 
   SetupFontAndStyle(false);
 
+  ImGuiStyle& style = ImGui::GetStyle();
+  style.ScaleAllSizes(dpi_scale_);
+  style.FontScaleDpi = dpi_scale_;
+
   ImGui_ImplSDL3_InitForSDLRenderer(stream_window_, stream_renderer_);
   ImGui_ImplSDLRenderer3_Init(stream_renderer_);
 
@@ -924,16 +910,16 @@ int Render::DrawMainWindow() {
   ImGui::SetNextWindowSize(ImVec2(io.DisplaySize.x, io.DisplaySize.y),
                            ImGuiCond_Always);
   ImGui::Begin("MainRender", nullptr,
-               ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
-                   ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar |
-                   ImGuiWindowFlags_NoBringToFrontOnFocus);
+               ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration |
+                   ImGuiWindowFlags_NoBringToFrontOnFocus |
+                   ImGuiWindowFlags_NoDocking);
   ImGui::PopStyleColor();
 
   TitleBar(true);
 
   MainWindow();
 
-  // UpdateNotificationWindow();
+  UpdateNotificationWindow();
 
 #ifdef __APPLE__
   if (show_request_permission_window_) {
@@ -968,23 +954,31 @@ int Render::DrawStreamWindow() {
 
   StreamWindow();
 
-  if (!fullscreen_button_pressed_) {
-    ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
-    ImGui::SetNextWindowSize(
-        ImVec2(stream_window_width_,
-               fullscreen_button_pressed_ ? 0 : title_bar_height_),
-        ImGuiCond_Always);
-    ImGui::Begin("StreamWindowTitleBar", nullptr,
-                 ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration |
-                     ImGuiWindowFlags_NoBringToFrontOnFocus |
-                     ImGuiWindowFlags_NoDocking);
+  ImGuiIO& io = ImGui::GetIO();
+  float stream_title_window_height =
+      fullscreen_button_pressed_ ? 0 : title_bar_height_;
 
+  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+  // Set minimum window size to 0 to allow exact height control
+  ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(0, 0));
+  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
+  ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
+  ImGui::SetNextWindowSize(ImVec2(io.DisplaySize.x, stream_title_window_height),
+                           ImGuiCond_Always);
+  ImGui::Begin("StreamTitleWindow", nullptr,
+               ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration |
+                   ImGuiWindowFlags_NoBringToFrontOnFocus |
+                   ImGuiWindowFlags_NoDocking);
+  ImGui::PopStyleVar(2);
+  ImGui::PopStyleColor();
+
+  if (!fullscreen_button_pressed_) {
     TitleBar(false);
-    ImGui::End();
   }
 
+  ImGui::End();
+
   // Rendering
-  ImGuiIO& io = ImGui::GetIO();
   (void)io;
   ImGui::Render();
   SDL_SetRenderScale(stream_renderer_, io.DisplayFramebufferScale.x,
@@ -1272,6 +1266,9 @@ void Render::Cleanup() {
 
   CleanupFactories();
   CleanupPeers();
+
+  WaitForThumbnailSaveTasks();
+
   AudioDeviceDestroy();
   DestroyMainWindowContext();
   DestroyMainWindow();
@@ -1299,10 +1296,29 @@ void Render::CleanupPeer(std::shared_ptr<SubStreamWindowProperties> props) {
   SDL_FlushEvent(STREAM_REFRESH_EVENT);
 
   if (props->dst_buffer_) {
-    thumbnail_->SaveToThumbnail(
-        (char*)props->dst_buffer_, props->video_width_, props->video_height_,
-        props->remote_id_, props->remote_host_name_,
-        props->remember_password_ ? props->remote_password_ : "");
+    size_t buffer_size = props->dst_buffer_capacity_;
+    std::vector<unsigned char> buffer_copy(buffer_size);
+    memcpy(buffer_copy.data(), props->dst_buffer_, buffer_size);
+
+    int video_width = props->video_width_;
+    int video_height = props->video_height_;
+    std::string remote_id = props->remote_id_;
+    std::string remote_host_name = props->remote_host_name_;
+    std::string password =
+        props->remember_password_ ? props->remote_password_ : "";
+
+    std::thread save_thread([buffer_copy, video_width, video_height, remote_id,
+                             remote_host_name, password,
+                             thumbnail = thumbnail_]() {
+      thumbnail->SaveToThumbnail((char*)buffer_copy.data(), video_width,
+                                 video_height, remote_id, remote_host_name,
+                                 password);
+    });
+
+    {
+      std::lock_guard<std::mutex> lock(thumbnail_save_threads_mutex_);
+      thumbnail_save_threads_.emplace_back(std::move(save_thread));
+    }
   }
 
   if (props->peer_) {
@@ -1340,6 +1356,25 @@ void Render::CleanupPeers() {
   }
 }
 
+void Render::WaitForThumbnailSaveTasks() {
+  std::vector<std::thread> threads_to_join;
+
+  {
+    std::lock_guard<std::mutex> lock(thumbnail_save_threads_mutex_);
+    threads_to_join.swap(thumbnail_save_threads_);
+  }
+
+  if (threads_to_join.empty()) {
+    return;
+  }
+
+  for (auto& thread : threads_to_join) {
+    if (thread.joinable()) {
+      thread.join();
+    }
+  }
+}
+
 void Render::CleanSubStreamWindowProperties(
     std::shared_ptr<SubStreamWindowProperties> props) {
   if (props->stream_texture_) {

src/gui/render.h

@@ -18,6 +18,7 @@
 #include <shared_mutex>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 #include "IconsFontAwesome6.h"
 #include "config_center.h"
@@ -175,7 +176,6 @@ class Render {
  private:
   int ConnectTo(const std::string& remote_id, const char* password,
                 bool remember_password);
-  int UpdateWindowSizeWithDpiScale(float dpi_scale);
   int CreateMainWindow();
   int DestroyMainWindow();
   int CreateStreamWindow();
@@ -294,13 +294,15 @@ class Render {
   /* ------ all windows property start ------ */
   float title_bar_width_ = 640;
   float title_bar_height_ = 30;
+  float title_bar_button_width_ = 30;
+  float title_bar_button_height_ = 30;
   /* ------ all windows property end ------ */
 
   /* ------ main window property start ------ */
   // thumbnail
   unsigned char aes128_key_[16];
   unsigned char aes128_iv_[16];
-  std::unique_ptr<Thumbnail> thumbnail_;
+  std::shared_ptr<Thumbnail> thumbnail_;
 
   // recent connections
   std::vector<std::pair<std::string, Thumbnail::RecentConnection>>
@@ -511,6 +513,11 @@ class Render {
   void CloseTab(decltype(client_properties_)::iterator& it);
   /* ------ stream window property end ------ */
 
+  /* ------ async thumbnail save tasks ------ */
+  std::vector<std::thread> thumbnail_save_threads_;
+  std::mutex thumbnail_save_threads_mutex_;
+  void WaitForThumbnailSaveTasks();
+
   /* ------ server mode ------ */
   std::unordered_map<std::string, ConnectionStatus> connection_status_;
 };

src/gui/toolbars/control_bar.cpp

@@ -32,28 +32,25 @@ int LossRateDisplay(float loss_rate) {
 }
 
 int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f * dpi_scale_);
+  float button_width = title_bar_height_ * 0.8f;
+  float button_height = title_bar_height_ * 0.8f;
+  float line_padding = title_bar_height_ * 0.12f;
+  float line_thickness = title_bar_height_ * 0.07f;
 
+  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
   if (props->control_bar_expand_) {
-    float button_width = 24.0f * dpi_scale_;
-    float button_height = 24.0f * dpi_scale_;
-    float line_padding = 4.0f * dpi_scale_;
+    ImGui::SetCursorPosX(props->is_control_bar_in_left_
+                             ? props->control_window_width_ * 1.03f
+                             : props->control_window_width_ * 0.2f);
 
-    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();
-
-    if (props->is_control_bar_in_left_) {
+    if (!props->is_control_bar_in_left_) {
       draw_list->AddLine(
-          ImVec2(ImGui::GetCursorScreenPos().x - 5.0f * dpi_scale_,
-                 ImGui::GetCursorScreenPos().y - 7.0f * dpi_scale_),
-          ImVec2(ImGui::GetCursorScreenPos().x - 5.0f * dpi_scale_,
-                 ImGui::GetCursorScreenPos().y - 7.0f * dpi_scale_ +
-                     props->control_window_height_),
-          IM_COL32(178, 178, 178, 255), 1.0f);
+          ImVec2(ImGui::GetCursorScreenPos().x - button_height * 0.56f,
+                 ImGui::GetCursorScreenPos().y + button_height * 0.2f),
+          ImVec2(ImGui::GetCursorScreenPos().x - button_height * 0.56f,
+                 ImGui::GetCursorScreenPos().y + button_height * 0.8f),
+          IM_COL32(178, 178, 178, 255), 2.0f);
     }
 
     std::string display = ICON_FA_DISPLAY;
@@ -90,7 +87,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
         std::to_string(props->selected_display_ + 1).c_str());
     ImVec2 text_pos =
         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(
         text_pos, IM_COL32(0, 0, 0, 255),
         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_
                             ? ICON_FA_COMPUTER_MOUSE
                             : ICON_FA_COMPUTER_MOUSE;
+    ImGui::SetWindowFontScale(0.5f);
     if (ImGui::Button(mouse.c_str(), ImVec2(button_width, button_height))) {
       if (props->connection_established_) {
         start_keyboard_capturer_ = !start_keyboard_capturer_;
@@ -117,7 +115,6 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
     }
 
     if (!props->mouse_control_button_pressed_) {
-      float line_thickness = 2.0f * dpi_scale_;
       draw_list->AddLine(ImVec2(disable_mouse_x, disable_mouse_y),
                          ImVec2(mouse_x + button_width - 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_
                             ? ICON_FA_VOLUME_HIGH
                             : ICON_FA_VOLUME_HIGH;
+    ImGui::SetWindowFontScale(0.5f);
     if (ImGui::Button(audio.c_str(), ImVec2(button_width, button_height))) {
       if (props->connection_established_) {
         props->audio_capture_button_pressed_ =
@@ -162,7 +160,6 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
     }
 
     if (!props->audio_capture_button_pressed_) {
-      float line_thickness = 2.0f * dpi_scale_;
       draw_list->AddLine(ImVec2(disable_audio_x, disable_audio_y),
                          ImVec2(audio_x + button_width - 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;
     }
     std::string net_traffic_stats = ICON_FA_SIGNAL;
+    ImGui::SetWindowFontScale(0.5f);
     if (ImGui::Button(net_traffic_stats.c_str(),
                       ImVec2(button_width, button_height))) {
       props->net_traffic_stats_button_pressed_ =
@@ -210,6 +208,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
     // fullscreen button
     std::string fullscreen =
         fullscreen_button_pressed_ ? ICON_FA_COMPRESS : ICON_FA_EXPAND;
+    ImGui::SetWindowFontScale(0.5f);
     if (ImGui::Button(fullscreen.c_str(),
                       ImVec2(button_width, button_height))) {
       fullscreen_button_pressed_ = !fullscreen_button_pressed_;
@@ -229,6 +228,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
     ImGui::SameLine();
     // close button
     std::string close_button = ICON_FA_XMARK;
+    ImGui::SetWindowFontScale(0.5f);
     if (ImGui::Button(close_button.c_str(),
                       ImVec2(button_width, button_height))) {
       CleanupPeer(props);
@@ -236,20 +236,27 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
 
     ImGui::SameLine();
 
-    if (!props->is_control_bar_in_left_) {
-      draw_list->AddLine(ImVec2(ImGui::GetCursorScreenPos().x - 3.0f,
-                                ImGui::GetCursorScreenPos().y - 7.0f),
-                         ImVec2(ImGui::GetCursorScreenPos().x - 3.0f,
-                                ImGui::GetCursorScreenPos().y - 7.0f +
-                                    props->control_window_height_),
-                         IM_COL32(178, 178, 178, 255), 1.0f);
+    if (props->is_control_bar_in_left_) {
+      draw_list->AddLine(
+          ImVec2(ImGui::GetCursorScreenPos().x + button_height * 0.2f,
+                 ImGui::GetCursorScreenPos().y + button_height * 0.2f),
+          ImVec2(ImGui::GetCursorScreenPos().x + button_height * 0.2f,
+                 ImGui::GetCursorScreenPos().y + button_height * 0.8f),
+          IM_COL32(178, 178, 178, 255), 2.0f);
     }
+
+    ImGui::SameLine();
   }
 
-  ImGui::SetCursorPosX(
-      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.91f
+                                        : 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 =
       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
                                             : ICON_FA_ANGLE_LEFT);
   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_button_pressed_time_ = ImGui::GetTime();
     props->control_window_width_is_changing_ = true;
 
     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;
     }
   }
@@ -280,12 +287,13 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
 
 int Render::NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props) {
   ImGui::SetCursorPos(ImVec2(props->is_control_bar_in_left_
-                                 ? (props->control_window_width_ + 5.0f)
-                                 : 5.0f,
-                             35.0f * dpi_scale_));
+                                 ? props->control_window_width_ * 1.02f
+                                 : props->control_window_width_ * 0.02f,
+                             props->control_window_min_height_));
+  ImGui::SetWindowFontScale(0.5f);
   if (ImGui::BeginTable("NetTrafficStats", 4, ImGuiTableFlags_BordersH,
-                        ImVec2(props->control_window_max_width_ - 10.0f,
-                               props->control_window_max_height_ - 60.0f))) {
+                        ImVec2(props->control_window_max_width_ * 0.9f,
+                               props->control_window_max_height_ - 0.9f))) {
     ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed);
     ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
     ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
@@ -344,9 +352,12 @@ int Render::NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props) {
     ImGui::Text("FPS");
     ImGui::TableNextColumn();
     ImGui::Text("%d", props->fps_);
+    ImGui::TableNextColumn();
+    ImGui::TableNextColumn();
 
     ImGui::EndTable();
   }
+  ImGui::SetWindowFontScale(1.0f);
 
   return 0;
 }

src/gui/toolbars/title_bar.cpp

@@ -9,16 +9,32 @@ namespace crossdesk {
 
 int Render::TitleBar(bool main_window) {
   ImGuiIO& io = ImGui::GetIO();
-  float title_bar_width = io.DisplaySize.x;
-  float title_bar_height = io.DisplaySize.y * TITLE_BAR_HEIGHT;
-  float title_bar_button_width = io.DisplaySize.x * TITLE_BAR_BUTTON_WIDTH;
-  float title_bar_button_height = io.DisplaySize.y * TITLE_BAR_BUTTON_HEIGHT;
+  float title_bar_width = title_bar_width_;
+  float title_bar_height = title_bar_height_;
+  float title_bar_height_padding = title_bar_height_;
+  float title_bar_button_width = title_bar_button_width_;
+  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;
+    title_bar_height_padding = 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::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
   ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
   ImGui::BeginChild(main_window ? "MainTitleBar" : "StreamTitleBar",
-                    ImVec2(title_bar_width, title_bar_height),
+                    ImVec2(title_bar_width, title_bar_height_padding),
                     ImGuiChildFlags_Border,
                     ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
                         ImGuiWindowFlags_NoBringToFrontOnFocus);
@@ -106,7 +122,7 @@ int Render::TitleBar(bool main_window) {
 
       if (update_available_ && ImGui::IsItemHovered()) {
         ImGui::BeginTooltip();
-        ImGui::SetWindowFontScale(0.5f * dpi_scale_);
+        ImGui::SetWindowFontScale(0.5f);
         std::string new_version_available_str =
             localization::new_version_available[localization_language_index_] +
             ": " + latest_version_;
@@ -115,7 +131,7 @@ int Render::TitleBar(bool main_window) {
         ImGui::EndTooltip();
       }
 
-      ImGui::EndMenu();
+      ImGui::EndPopup();
     } else {
       show_new_version_icon_in_menu_ = true;
     }
@@ -136,7 +152,9 @@ int Render::TitleBar(bool main_window) {
       // render for 1 second
       if (show_new_version_icon_) {
         ImGui::SetWindowFontScale(0.6f);
-        ImGui::SetCursorPos(ImVec2(bar_pos_x + 10, bar_pos_y - 17));
+        ImGui::SetCursorPos(
+            ImVec2(bar_pos_x + title_bar_button_width * 0.15f,
+                   bar_pos_y - title_bar_button_width * 0.325f));
         ImGui::Text(ICON_FA_TRIANGLE_EXCLAMATION);
         ImGui::SetWindowFontScale(1.0f);
 
@@ -165,7 +183,7 @@ int Render::TitleBar(bool main_window) {
   float minimize_pos_x = title_bar_width -
                          title_bar_button_width * (main_window ? 2 : 3) +
                          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;
   if (ImGui::Button(window_minimize_button.c_str(),
                     ImVec2(title_bar_button_width, title_bar_button_height))) {
@@ -185,7 +203,7 @@ int Render::TitleBar(bool main_window) {
     ImGui::PushStyleColor(ImGuiCol_ButtonActive,
                           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_y_top = title_bar_button_height * 0.36f;
       float pos_x_bottom = title_bar_width - title_bar_button_width * 1.6f;
@@ -249,7 +267,7 @@ int Render::TitleBar(bool main_window) {
   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_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;
   std::string close_button = "##xmark";  // ICON_FA_XMARK;
   if (ImGui::Button(close_button.c_str(),

src/gui/windows/about_window.cpp

@@ -37,17 +37,18 @@ void Render::Hyperlink(const std::string& label, const std::string& url,
 
 int Render::AboutWindow() {
   if (show_about_window_) {
-    const ImGuiViewport* viewport = ImGui::GetMainViewport();
-
+    float about_window_width = title_bar_button_width_ * 7.5f;
     float about_window_height = latest_version_.empty()
-                                    ? about_window_height_
-                                    : about_window_height_ + 20.0f;
+                                    ? title_bar_button_width_ * 4.0f
+                                    : title_bar_button_width_ * 4.6f;
+
+    const ImGuiViewport* viewport = ImGui::GetMainViewport();
     ImGui::SetNextWindowPos(ImVec2(
-        (viewport->WorkSize.x - viewport->WorkPos.x - about_window_width_) / 2,
+        (viewport->WorkSize.x - viewport->WorkPos.x - about_window_width) / 2,
         (viewport->WorkSize.y - viewport->WorkPos.y - about_window_height) /
             2));
 
-    ImGui::SetNextWindowSize(ImVec2(about_window_width_, about_window_height));
+    ImGui::SetNextWindowSize(ImVec2(about_window_width, about_window_height));
 
     ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
@@ -70,7 +71,7 @@ int Render::AboutWindow() {
 
     std::string text = localization::version[localization_language_index_] +
                        ": CrossDesk " + version;
-    ImGui::SetCursorPosX(about_window_width_ * 0.1f);
+    ImGui::SetCursorPosX(about_window_width * 0.1f);
     ImGui::Text("%s", text.c_str());
 
     if (update_available_) {
@@ -79,19 +80,19 @@ int Render::AboutWindow() {
           ": " + latest_version_;
       std::string access_website =
           localization::access_website[localization_language_index_];
-      Hyperlink(latest_version, "https://crossdesk.cn", about_window_width_);
+      Hyperlink(latest_version, "https://crossdesk.cn", about_window_width);
     }
 
     ImGui::Text("");
 
     std::string copyright_text = "© 2025 by JUNKUN DI. All rights reserved.";
     std::string license_text = "Licensed under GNU LGPL v3.";
-    ImGui::SetCursorPosX(about_window_width_ * 0.1f);
+    ImGui::SetCursorPosX(about_window_width * 0.1f);
     ImGui::Text("%s", copyright_text.c_str());
-    ImGui::SetCursorPosX(about_window_width_ * 0.1f);
+    ImGui::SetCursorPosX(about_window_width * 0.1f);
     ImGui::Text("%s", license_text.c_str());
 
-    ImGui::SetCursorPosX(about_window_width_ * 0.42f);
+    ImGui::SetCursorPosX(about_window_width * 0.445f);
     ImGui::SetCursorPosY(about_window_height * 0.75f);
     // OK
     if (ImGui::Button(localization::ok[localization_language_index_].c_str())) {

src/gui/windows/connection_status_window.cpp

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

src/gui/windows/control_window.cpp

@@ -53,11 +53,11 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
       ImVec2(props->control_window_width_, props->control_window_height_),
       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_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_) {
     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_ &&
                  ImGui::IsMouseReleased(ImGuiMouseButton_Left) ||
              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_ >
           stream_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;
-    } 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_y =
           (props->control_window_pos_.y >= y_boundary &&
            props->control_window_pos_.y <=
                stream_window_height_ - props->control_window_height_)
               ? props->control_window_pos_.y
-              : (props->control_window_pos_.y < (fullscreen_button_pressed_
-                                                     ? 0
-                                                     : (title_bar_height_ + 1))
-                     ? (fullscreen_button_pressed_ ? 0
-                                                   : (title_bar_height_ + 1))
+              : (props->control_window_pos_.y <
+                         (fullscreen_button_pressed_ ? 0 : title_bar_height_)
+                     ? (fullscreen_button_pressed_ ? 0 : title_bar_height_)
                      : (stream_window_height_ - props->control_window_height_));
 
       if (props->control_bar_expand_) {
@@ -205,10 +203,10 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
 
   std::string control_child_window_title =
       props->remote_id_ + "ControlChildWindow";
-  ImGui::BeginChild(
-      control_child_window_title.c_str(),
-      ImVec2(props->control_window_width_ * 2, props->control_window_height_),
-      ImGuiChildFlags_Border, ImGuiWindowFlags_NoDecoration);
+  ImGui::BeginChild(control_child_window_title.c_str(),
+                    ImVec2(props->control_window_width_ * 2.0f,
+                           props->control_window_height_),
+                    ImGuiChildFlags_Border, ImGuiWindowFlags_NoDecoration);
   ImGui::PopStyleColor();
 
   ControlBar(props);

src/gui/windows/main_settings_window.cpp

@@ -6,31 +6,38 @@
 namespace crossdesk {
 
 int Render::SettingWindow() {
+  ImGuiIO& io = ImGui::GetIO();
   if (show_settings_window_) {
     if (settings_window_pos_reset_) {
       const ImGuiViewport* viewport = ImGui::GetMainViewport();
       if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
+#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
+      !defined(__arm__) && USE_CUDA) ||                                   \
+     defined(__APPLE__))
         ImGui::SetNextWindowPos(
-            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
-                    SETTINGS_WINDOW_WIDTH_CN) /
-                       2,
-                   (viewport->WorkSize.y - viewport->WorkPos.y -
-                    SETTINGS_WINDOW_HEIGHT_CN) /
-                       2));
-
+            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.07f));
         ImGui::SetNextWindowSize(
-            ImVec2(SETTINGS_WINDOW_WIDTH_CN, SETTINGS_WINDOW_HEIGHT_CN));
+            ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.85f));
+#else
+        ImGui::SetNextWindowPos(
+            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.1f));
+        ImGui::SetNextWindowSize(
+            ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.8f));
+#endif
       } else {
+#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
+      !defined(__arm__) && USE_CUDA) ||                                   \
+     defined(__APPLE__))
         ImGui::SetNextWindowPos(
-            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
-                    SETTINGS_WINDOW_WIDTH_EN) /
-                       2,
-                   (viewport->WorkSize.y - viewport->WorkPos.y -
-                    SETTINGS_WINDOW_HEIGHT_EN) /
-                       2));
-
+            ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.07f));
         ImGui::SetNextWindowSize(
-            ImVec2(SETTINGS_WINDOW_WIDTH_EN, SETTINGS_WINDOW_HEIGHT_EN));
+            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.85f));
+#else
+        ImGui::SetNextWindowPos(
+            ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.1f));
+        ImGui::SetNextWindowSize(
+            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.8f));
+#endif
       }
 
       settings_window_pos_reset_ = false;
@@ -38,7 +45,7 @@ int Render::SettingWindow() {
 
     // Settings
     {
-      static int settings_items_padding = 30 * dpi_scale_;
+      static int settings_items_padding = title_bar_button_width_ * 0.75f;
       int settings_items_offset = 0;
 
       ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
@@ -57,17 +64,18 @@ int Render::SettingWindow() {
             localization::language_en[localization_language_index_].c_str()};
 
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4 * dpi_scale_);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text(
             "%s", localization::language[localization_language_index_].c_str());
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(LANGUAGE_SELECT_WINDOW_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
         } else {
-          ImGui::SetCursorPosX(LANGUAGE_SELECT_WINDOW_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.5f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH);
 
+        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
         if (ImGui::BeginCombo("##language",
                               language_items[language_button_value_])) {
           ImGui::SetWindowFontScale(0.5f);
@@ -97,19 +105,19 @@ int Render::SettingWindow() {
                 .c_str()};
 
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4 * dpi_scale_);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text(
             "%s",
             localization::video_quality[localization_language_index_].c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
         } else {
-          ImGui::SetCursorPosX(VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.5f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH);
 
+        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
         if (ImGui::BeginCombo(
                 "##video_quality",
                 video_quality_items[video_quality_button_value_])) {
@@ -130,19 +138,19 @@ int Render::SettingWindow() {
         const char* video_frame_rate_items[] = {"30 fps", "60 fps"};
 
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text("%s",
                     localization::video_frame_rate[localization_language_index_]
                         .c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
         } else {
-          ImGui::SetCursorPosX(VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.5f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH);
 
+        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
         if (ImGui::BeginCombo(
                 "##video_frame_rate",
                 video_frame_rate_items[video_frame_rate_button_value_])) {
@@ -165,20 +173,20 @@ int Render::SettingWindow() {
             localization::av1[localization_language_index_].c_str()};
 
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text(
             "%s",
             localization::video_encode_format[localization_language_index_]
                 .c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
         } else {
-          ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.5f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH);
 
+        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
         if (ImGui::BeginCombo(
                 "##video_encode_format",
                 video_encode_format_items[video_encode_format_button_value_])) {
@@ -193,22 +201,25 @@ int Render::SettingWindow() {
         }
       }
 
-#if USE_CUDA && !defined(__aarch64__) && !defined(__arm__)
+#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
+      !defined(__arm__) && USE_CUDA) ||                                   \
+     defined(__APPLE__))
       ImGui::Separator();
 
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text("%s", localization::enable_hardware_video_codec
                               [localization_language_index_]
                                   .c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
         } else {
-          ImGui::SetCursorPosX(ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
+
         ImGui::Checkbox("##enable_hardware_video_codec",
                         &enable_hardware_video_codec_);
       }
@@ -218,17 +229,18 @@ int Render::SettingWindow() {
 
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text(
             "%s",
             localization::enable_turn[localization_language_index_].c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(ENABLE_TURN_CHECKBOX_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
         } else {
-          ImGui::SetCursorPosX(ENABLE_TURN_CHECKBOX_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
+
         ImGui::Checkbox("##enable_turn", &enable_turn_);
       }
 
@@ -236,17 +248,18 @@ int Render::SettingWindow() {
 
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text(
             "%s",
             localization::enable_srtp[localization_language_index_].c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(ENABLE_SRTP_CHECKBOX_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
         } else {
-          ImGui::SetCursorPosX(ENABLE_SRTP_CHECKBOX_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
+
         ImGui::Checkbox("##enable_srtp", &enable_srtp_);
       }
 
@@ -255,19 +268,19 @@ int Render::SettingWindow() {
       {
         settings_items_offset += settings_items_padding;
         ImGui::SetCursorPosY(settings_items_offset + 1);
-
+        ImGui::AlignTextToFramePadding();
         if (ImGui::Button(localization::self_hosted_server_config
                               [localization_language_index_]
                                   .c_str())) {
           show_self_hosted_server_config_window_ = true;
         }
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
         } else {
-          ImGui::SetCursorPosX(ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
+
         ImGui::Checkbox("##enable_self_hosted", &enable_self_hosted_);
       }
 
@@ -275,18 +288,18 @@ int Render::SettingWindow() {
 
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4);
-
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text("%s",
                     localization::enable_autostart[localization_language_index_]
                         .c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(ENABLE_AUTOSTART_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
         } else {
-          ImGui::SetCursorPosX(ENABLE_AUTOSTART_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
+
         ImGui::Checkbox("##enable_autostart_", &enable_autostart_);
       }
 
@@ -294,18 +307,18 @@ int Render::SettingWindow() {
 
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4);
-
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text(
             "%s",
             localization::enable_daemon[localization_language_index_].c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(ENABLE_DAEMON_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
         } else {
-          ImGui::SetCursorPosX(ENABLE_DAEMON_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
+
         ImGui::Checkbox("##enable_daemon_", &enable_daemon_);
         if (ImGui::IsItemHovered()) {
           ImGui::BeginTooltip();
@@ -322,18 +335,18 @@ int Render::SettingWindow() {
 
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 4);
-
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text("%s",
                     localization::minimize_to_tray[localization_language_index_]
                         .c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(ENABLE_MINIZE_TO_TRAY_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
         } else {
-          ImGui::SetCursorPosX(ENABLE_MINIZE_TO_TRAY_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
         }
-        ImGui::SetCursorPosY(settings_items_offset);
+
         ImGui::Checkbox("##enable_minimize_to_tray_",
                         &enable_minimize_to_tray_);
       }
@@ -343,13 +356,15 @@ int Render::SettingWindow() {
       }
 
       if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-        ImGui::SetCursorPosX(SETTINGS_OK_BUTTON_PADDING_CN);
+        ImGui::SetCursorPosX(title_bar_button_width_ * 1.59f);
       } else {
-        ImGui::SetCursorPosX(SETTINGS_OK_BUTTON_PADDING_EN);
+        ImGui::SetCursorPosX(title_bar_button_width_ * 2.22f);
       }
 
-      settings_items_offset += settings_items_padding + 10;
+      settings_items_offset +=
+          settings_items_padding + title_bar_button_width_ * 0.3f;
       ImGui::SetCursorPosY(settings_items_offset);
+
       ImGui::PopStyleVar();
 
       // OK

src/gui/windows/main_window.cpp

@@ -9,9 +9,9 @@ int Render::MainWindow() {
   ImGuiIO& io = ImGui::GetIO();
   float local_remote_window_width = io.DisplaySize.x;
   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);
   ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
   ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
@@ -34,7 +34,7 @@ int Render::MainWindow() {
   RemoteWindow();
   ImGui::EndChild();
 
-  // RecentConnectionsWindow();
+  RecentConnectionsWindow();
   StatusBar();
 
   if (show_connection_status_window_) {

src/gui/windows/server_settings_window.cpp

@@ -54,7 +54,7 @@ int Render::ShowSimpleFileBrowser() {
   if (show_file_browser_) {
     ImGui::PushItemFlag(ImGuiItemFlags_AutoClosePopups, false);
 
-    float fixed_width = 130.0f * dpi_scale_;
+    float fixed_width = title_bar_button_width_ * 3.8f;
     ImGui::SetNextItemWidth(fixed_width);
     ImGui::SetNextWindowSizeConstraints(ImVec2(fixed_width, 0),
                                         ImVec2(fixed_width, 100.0f));
@@ -121,33 +121,19 @@ int Render::ShowSimpleFileBrowser() {
 }
 
 int Render::SelfHostedServerWindow() {
+  ImGuiIO& io = ImGui::GetIO();
   if (show_self_hosted_server_config_window_) {
     if (self_hosted_server_config_window_pos_reset_) {
-      const ImGuiViewport* viewport = ImGui::GetMainViewport();
       if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
         ImGui::SetNextWindowPos(
-            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
-                    SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN) /
-                       2,
-                   (viewport->WorkSize.y - viewport->WorkPos.y -
-                    SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN) /
-                       2));
-
+            ImVec2(io.DisplaySize.x * 0.298f, io.DisplaySize.y * 0.25f));
         ImGui::SetNextWindowSize(
-            ImVec2(SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN,
-                   SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN));
+            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.41f));
       } else {
         ImGui::SetNextWindowPos(
-            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
-                    SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN) /
-                       2,
-                   (viewport->WorkSize.y - viewport->WorkPos.y -
-                    SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_EN) /
-                       2));
-
+            ImVec2(io.DisplaySize.x * 0.27f, io.DisplaySize.y * 0.3f));
         ImGui::SetNextWindowSize(
-            ImVec2(SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN,
-                   SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_EN));
+            ImVec2(io.DisplaySize.x * 0.465f, io.DisplaySize.y * 0.41f));
       }
 
       self_hosted_server_config_window_pos_reset_ = false;
@@ -155,7 +141,7 @@ int Render::SelfHostedServerWindow() {
 
     // Settings
     {
-      static int settings_items_padding = 30 * dpi_scale_;
+      static int settings_items_padding = title_bar_button_width_;
       int settings_items_offset = 0;
 
       ImGui::SetWindowFontScale(0.5f);
@@ -174,17 +160,19 @@ int Render::SelfHostedServerWindow() {
       ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 2);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text("%s", localization::self_hosted_server_address
                               [localization_language_index_]
                                   .c_str());
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 2.5f);
         } else {
-          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 3.43f);
         }
         ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::SetNextItemWidth(SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH);
+        ImGui::SetNextItemWidth(title_bar_button_width_ * 3.8f);
 
         ImGui::InputText("##signal_server_ip_self_", signal_server_ip_self_,
                          IM_ARRAYSIZE(signal_server_ip_self_),
@@ -195,19 +183,20 @@ int Render::SelfHostedServerWindow() {
 
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 2);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text(
             "%s",
             localization::self_hosted_server_port[localization_language_index_]
                 .c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 2.5f);
         } else {
-          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 3.43f);
         }
         ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::SetNextItemWidth(SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH);
+        ImGui::SetNextItemWidth(title_bar_button_width_ * 3.8f);
 
         ImGui::InputText("##signal_server_port_self_", signal_server_port_self_,
                          IM_ARRAYSIZE(signal_server_port_self_));
@@ -217,18 +206,19 @@ int Render::SelfHostedServerWindow() {
 
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 2);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text("%s", localization::self_hosted_server_coturn_server_port
                               [localization_language_index_]
                                   .c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 2.5f);
         } else {
-          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 3.43f);
         }
         ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::SetNextItemWidth(SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH);
+        ImGui::SetNextItemWidth(title_bar_button_width_ * 3.8f);
 
         ImGui::InputText("##coturn_server_port_self_", coturn_server_port_self_,
                          IM_ARRAYSIZE(coturn_server_port_self_));
@@ -238,18 +228,19 @@ int Render::SelfHostedServerWindow() {
 
       {
         settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 2);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
         ImGui::Text("%s", localization::self_hosted_server_certificate_path
                               [localization_language_index_]
                                   .c_str());
-
+        ImGui::SameLine();
         if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 2.5f);
         } else {
-          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN);
+          ImGui::SetCursorPosX(title_bar_button_width_ * 3.43f);
         }
         ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::SetNextItemWidth(SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH);
+        ImGui::SetNextItemWidth(title_bar_button_width_ * 3.8f);
 
         ShowSimpleFileBrowser();
       }
@@ -259,12 +250,13 @@ int Render::SelfHostedServerWindow() {
       }
 
       if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-        ImGui::SetCursorPosX(SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_CN);
+        ImGui::SetCursorPosX(title_bar_button_width_ * 2.32f);
       } else {
-        ImGui::SetCursorPosX(SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN);
+        ImGui::SetCursorPosX(title_bar_button_width_ * 2.7f);
       }
 
-      settings_items_offset += settings_items_padding + 10;
+      settings_items_offset +=
+          settings_items_padding + title_bar_button_width_ * 0.3f;
       ImGui::SetCursorPosY(settings_items_offset);
       ImGui::PopStyleVar();
 

src/gui/windows/stream_window.cpp

@@ -69,9 +69,12 @@ int Render::StreamWindow() {
       ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoMove;
 
   if (!fullscreen_button_pressed_) {
-    ImGui::SetNextWindowPos(ImVec2(20.0f * dpi_scale_, 0), ImGuiCond_Always);
-    ImGui::SetNextWindowSize(ImVec2(0, 30.0f * dpi_scale_), ImGuiCond_Always);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 8.0f));
+    ImGui::SetNextWindowPos(
+        ImVec2(title_bar_button_width_ * 0.8f, title_bar_button_width_ * 0.1f),
+        ImGuiCond_Always);
+    ImGui::SetNextWindowSize(ImVec2(0, title_bar_button_width_ * 0.8f),
+                             ImGuiCond_Always);
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
     ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0.0f));
     ImGui::Begin("TabBar", nullptr,
@@ -111,7 +114,7 @@ int Render::StreamWindow() {
                 : props->remote_id_;
         if (ImGui::BeginTabItem(tab_label.c_str(), &props->tab_opened_)) {
           props->tab_selected_ = true;
-          ImGui::SetWindowFontScale(0.6f * dpi_scale_);
+          ImGui::SetWindowFontScale(0.6f);
 
           ImGui::SetNextWindowSize(
               ImVec2(stream_window_width_, stream_window_height_),
@@ -167,6 +170,20 @@ int Render::StreamWindow() {
           ImGui::EndTabItem();
         } else {
           props->tab_selected_ = false;
+          if (!props->tab_opened_) {
+            std::string remote_id_to_close = props->remote_id_;
+            // lock.unlock();
+            {
+              // std::unique_lock unique_lock(client_properties_mutex_);
+              auto close_it = client_properties_.find(remote_id_to_close);
+              if (close_it != client_properties_.end()) {
+                CloseTab(close_it);
+              }
+            }
+            // lock.lock();
+            it = client_properties_.begin();
+            continue;
+          }
           ++it;
         }
       }

src/gui/windows/update_notification_window.cpp

@@ -55,8 +55,8 @@ int Render::UpdateNotificationWindow() {
   if (show_update_notification_window_ && update_available_) {
     const ImGuiViewport* viewport = ImGui::GetMainViewport();
 
-    float window_width = update_notification_window_width_;
-    float window_height = update_notification_window_height_;
+    float update_notification_window_width = title_bar_button_width_ * 10.0f;
+    float update_notification_window_height = title_bar_button_width_ * 8.0f;
 
     // #ifdef __APPLE__
     //     float font_scale = 0.3f;
@@ -64,16 +64,16 @@ int Render::UpdateNotificationWindow() {
     //     float font_scale = 0.5f;
     // #endif
 
-    float button_width = 35.0f * dpi_scale_;
-    float button_height = 25.0f * dpi_scale_;
+    ImGui::SetNextWindowPos(ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
+                                    update_notification_window_width) /
+                                       2,
+                                   (viewport->WorkSize.y - viewport->WorkPos.y -
+                                    update_notification_window_height) /
+                                       2),
+                            ImGuiCond_FirstUseEver);
 
-    ImGui::SetNextWindowPos(
-        ImVec2(
-            (viewport->WorkSize.x - viewport->WorkPos.x - window_width) / 2,
-            (viewport->WorkSize.y - viewport->WorkPos.y - window_height) / 2),
-        ImGuiCond_FirstUseEver);
-
-    ImGui::SetNextWindowSize(ImVec2(window_width, window_height));
+    ImGui::SetNextWindowSize(ImVec2(update_notification_window_width,
+                                    update_notification_window_height));
 
     ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
@@ -85,11 +85,12 @@ int Render::UpdateNotificationWindow() {
         ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
             ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoTitleBar);
 
-    ImGui::SetCursorPosY(ImGui::GetCursorPosY() + window_height * 0.05f);
+    ImGui::SetCursorPosY(ImGui::GetCursorPosY() +
+                         update_notification_window_height * 0.05f);
 
     // title: new version available
-    ImGui::SetCursorPosX(window_width * 0.1f);
-    ImGui::SetWindowFontScale(0.6f);
+    ImGui::SetCursorPosX(update_notification_window_width * 0.1f);
+    ImGui::SetWindowFontScale(0.55f);
     std::string title =
         localization::new_version_available[localization_language_index_] +
         ": v" + latest_version_;
@@ -103,23 +104,25 @@ int Render::UpdateNotificationWindow() {
         localization::access_website[localization_language_index_] +
         "https://crossdesk.cn";
     ImGui::SetWindowFontScale(0.5f);
-    Hyperlink(download_text, "https://crossdesk.cn", window_width);
+    Hyperlink(download_text, "https://crossdesk.cn",
+              update_notification_window_width);
     ImGui::SetWindowFontScale(1.0f);
 
     ImGui::Spacing();
 
     float scrollable_height =
-        window_height - UPDATE_NOTIFICATION_RESERVED_HEIGHT;
+        update_notification_window_height - UPDATE_NOTIFICATION_RESERVED_HEIGHT;
 
     if (main_windows_system_chinese_font_ != nullptr) {
       ImGui::PushFont(main_windows_system_chinese_font_);
     }
     // scrollable content area
-    ImGui::SetCursorPosX(window_width * 0.05f);
-    ImGui::BeginChild("ScrollableContent",
-                      ImVec2(window_width * 0.9f, scrollable_height),
-                      ImGuiChildFlags_Border, ImGuiWindowFlags_None);
-    ImGui::SetWindowFontScale(0.6f);
+    ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
+    ImGui::BeginChild(
+        "ScrollableContent",
+        ImVec2(update_notification_window_width * 0.9f, scrollable_height),
+        ImGuiChildFlags_Border, ImGuiWindowFlags_None);
+    ImGui::SetWindowFontScale(0.5f);
     // set text wrap position to current available width (accounts for
     // scrollbar)
     float wrap_pos = ImGui::GetContentRegionAvail().x;
@@ -129,7 +132,7 @@ int Render::UpdateNotificationWindow() {
     if (latest_version_info_.contains("releaseName") &&
         latest_version_info_["releaseName"].is_string() &&
         !latest_version_info_["releaseName"].empty()) {
-      ImGui::SetCursorPosX(window_width * 0.05f);
+      ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
       std::string release_name =
           latest_version_info_["releaseName"].get<std::string>();
       ImGui::TextWrapped("%s", release_name.c_str());
@@ -138,7 +141,7 @@ int Render::UpdateNotificationWindow() {
 
     // release notes
     if (!release_notes_.empty()) {
-      ImGui::SetCursorPosX(window_width * 0.05f);
+      ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
       std::string cleaned_notes = CleanMarkdown(release_notes_);
       ImGui::TextWrapped("%s", cleaned_notes.c_str());
       ImGui::Spacing();
@@ -148,7 +151,7 @@ int Render::UpdateNotificationWindow() {
     if (latest_version_info_.contains("releaseDate") &&
         latest_version_info_["releaseDate"].is_string() &&
         !latest_version_info_["releaseDate"].empty()) {
-      ImGui::SetCursorPosX(window_width * 0.05f);
+      ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
       std::string date_label =
           localization::release_date[localization_language_index_];
       std::string release_date = latest_version_info_["releaseDate"];
@@ -170,16 +173,15 @@ int Render::UpdateNotificationWindow() {
     ImGui::Spacing();
 
     if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-      ImGui::SetCursorPosX(UPDATE_NOTIFICATION_OK_BUTTON_PADDING_CN);
+      ImGui::SetCursorPosX(update_notification_window_width * 0.407f);
     } else {
-      ImGui::SetCursorPosX(UPDATE_NOTIFICATION_OK_BUTTON_PADDING_EN);
+      ImGui::SetCursorPosX(update_notification_window_width * 0.367f);
     }
 
     ImGui::SetWindowFontScale(0.5f);
     // update button
     if (ImGui::Button(
-            localization::update[localization_language_index_].c_str(),
-            ImVec2(button_width, button_height))) {
+            localization::update[localization_language_index_].c_str())) {
       // open download page
       std::string url = "https://crossdesk.cn";
 #if defined(_WIN32)
@@ -196,8 +198,7 @@ int Render::UpdateNotificationWindow() {
     ImGui::SameLine();
 
     if (ImGui::Button(
-            localization::cancel[localization_language_index_].c_str(),
-            ImVec2(button_width, button_height))) {
+            localization::cancel[localization_language_index_].c_str())) {
       show_update_notification_window_ = false;
     }