From d017561e54f6501a120e1d9b4de8018866a91f46 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Thu, 19 Mar 2026 16:16:51 +0800 Subject: [PATCH] [fix] fix typo ImGuiChildFlags_Border to ImGuiChildFlags_Borders --- src/gui/panels/local_peer_panel.cpp | 4 ++-- src/gui/panels/recent_connections_panel.cpp | 6 +++--- src/gui/panels/remote_peer_panel.cpp | 4 ++-- src/gui/toolbars/status_bar.cpp | 4 ++-- src/gui/toolbars/title_bar.cpp | 4 ++-- src/gui/windows/control_window.cpp | 3 ++- src/gui/windows/file_transfer_window.cpp | 3 ++- src/gui/windows/main_window.cpp | 4 ++-- src/gui/windows/server_window.cpp | 6 +++--- src/gui/windows/update_notification_window.cpp | 3 ++- 10 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/gui/panels/local_peer_panel.cpp b/src/gui/panels/local_peer_panel.cpp index bf2c1d6..a4e2d53 100644 --- a/src/gui/panels/local_peer_panel.cpp +++ b/src/gui/panels/local_peer_panel.cpp @@ -46,7 +46,7 @@ int Render::LocalWindow() { ImGui::BeginChild( "LocalDesktopPanel", ImVec2(local_window_width * 0.8f, local_window_height * 0.43f), - ImGuiChildFlags_Border, + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus); ImGui::PopStyleVar(); @@ -300,4 +300,4 @@ int Render::LocalWindow() { return 0; } -} // namespace crossdesk \ No newline at end of file +} // namespace crossdesk diff --git a/src/gui/panels/recent_connections_panel.cpp b/src/gui/panels/recent_connections_panel.cpp index cb9f051..4831722 100644 --- a/src/gui/panels/recent_connections_panel.cpp +++ b/src/gui/panels/recent_connections_panel.cpp @@ -17,7 +17,7 @@ int Render::RecentConnectionsWindow() { ImGui::BeginChild( "RecentConnectionsWindow", ImVec2(recent_connection_window_width, recent_connection_window_height), - ImGuiChildFlags_Border, + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus); ImGui::PopStyleVar(); @@ -64,7 +64,7 @@ int Render::ShowRecentConnections() { ImGui::BeginChild( "RecentConnectionsContainer", ImVec2(recent_connection_panel_width, recent_connection_panel_height), - ImGuiChildFlags_Border, + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_AlwaysHorizontalScrollbar | @@ -360,4 +360,4 @@ int Render::OfflineWarningWindow() { ImGui::PopStyleVar(); return 0; } -} // namespace crossdesk \ No newline at end of file +} // namespace crossdesk diff --git a/src/gui/panels/remote_peer_panel.cpp b/src/gui/panels/remote_peer_panel.cpp index bdd8b48..67df1a5 100644 --- a/src/gui/panels/remote_peer_panel.cpp +++ b/src/gui/panels/remote_peer_panel.cpp @@ -48,7 +48,7 @@ int Render::RemoteWindow() { ImGui::BeginChild( "RemoteDesktopWindow_1", ImVec2(remote_window_width * 0.8f, remote_window_height * 0.43f), - ImGuiChildFlags_Border, + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus); ImGui::PopStyleVar(); @@ -270,4 +270,4 @@ int Render::ConnectTo(const std::string& remote_id, const char* password, return 0; } -} // namespace crossdesk \ No newline at end of file +} // namespace crossdesk diff --git a/src/gui/toolbars/status_bar.cpp b/src/gui/toolbars/status_bar.cpp index a56e9e1..624abd3 100644 --- a/src/gui/toolbars/status_bar.cpp +++ b/src/gui/toolbars/status_bar.cpp @@ -16,7 +16,7 @@ int Render::StatusBar() { ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 0.0f)); ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(1.0f, 1.0f, 1.0f, 0.0f)); ImGui::BeginChild("StatusBar", ImVec2(status_bar_width, status_bar_height), - ImGuiChildFlags_Border, + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus); ImGui::PopStyleColor(2); @@ -45,4 +45,4 @@ int Render::StatusBar() { ImGui::EndChild(); return 0; } -} // namespace crossdesk \ No newline at end of file +} // namespace crossdesk diff --git a/src/gui/toolbars/title_bar.cpp b/src/gui/toolbars/title_bar.cpp index 950766f..7653dea 100644 --- a/src/gui/toolbars/title_bar.cpp +++ b/src/gui/toolbars/title_bar.cpp @@ -51,7 +51,7 @@ int Render::TitleBar(bool main_window) { ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always); ImGui::BeginChild(main_window ? "MainTitleBar" : "StreamTitleBar", ImVec2(title_bar_width, title_bar_height_padding), - ImGuiChildFlags_Border, + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus); ImGui::PopStyleVar(); @@ -329,4 +329,4 @@ int Render::TitleBar(bool main_window) { ImGui::EndChild(); return 0; } -} // namespace crossdesk \ No newline at end of file +} // namespace crossdesk diff --git a/src/gui/windows/control_window.cpp b/src/gui/windows/control_window.cpp index 361d72d..0183e38 100644 --- a/src/gui/windows/control_window.cpp +++ b/src/gui/windows/control_window.cpp @@ -224,7 +224,7 @@ int Render::ControlWindow(std::shared_ptr& props) { ImGui::BeginChild( control_child_window_title.c_str(), ImVec2(props->control_window_width_, props->control_window_height_), - ImGuiChildFlags_Border, ImGuiWindowFlags_NoDecoration); + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration); ImGui::PopStyleColor(); props->control_window_pos_ = ImGui::GetWindowPos(); @@ -257,3 +257,4 @@ int Render::ControlWindow(std::shared_ptr& props) { return 0; } } // namespace crossdesk + diff --git a/src/gui/windows/file_transfer_window.cpp b/src/gui/windows/file_transfer_window.cpp index b31a93b..a9a3379 100644 --- a/src/gui/windows/file_transfer_window.cpp +++ b/src/gui/windows/file_transfer_window.cpp @@ -130,7 +130,7 @@ int Render::FileTransferWindow( ImGui::SetWindowFontScale(0.5f); ImGui::BeginChild( "FileList", ImVec2(0, file_transfer_window_height * 0.75f), - ImGuiChildFlags_Border, ImGuiWindowFlags_HorizontalScrollbar); + ImGuiChildFlags_Borders, ImGuiWindowFlags_HorizontalScrollbar); ImGui::SetWindowFontScale(1.0f); ImGui::SetWindowFontScale(0.5f); @@ -242,3 +242,4 @@ int Render::FileTransferWindow( } } // namespace crossdesk + diff --git a/src/gui/windows/main_window.cpp b/src/gui/windows/main_window.cpp index 6f4182a..0578176 100644 --- a/src/gui/windows/main_window.cpp +++ b/src/gui/windows/main_window.cpp @@ -19,7 +19,7 @@ int Render::MainWindow() { ImGui::BeginChild( "DeskWindow", ImVec2(local_remote_window_width, local_remote_window_height), - ImGuiChildFlags_Border, + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus); ImGui::PopStyleVar(); @@ -57,4 +57,4 @@ int Render::MainWindow() { return 0; } -} // namespace crossdesk \ No newline at end of file +} // namespace crossdesk diff --git a/src/gui/windows/server_window.cpp b/src/gui/windows/server_window.cpp index 0885d1a..6b1e17e 100644 --- a/src/gui/windows/server_window.cpp +++ b/src/gui/windows/server_window.cpp @@ -66,7 +66,7 @@ int Render::ServerWindow() { ImGui::BeginChild( "ServerTitleBar", ImVec2(server_window_width_, server_window_title_bar_height_), - ImGuiChildFlags_Border, + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus); @@ -140,7 +140,7 @@ int Render::RemoteClientInfoWindow() { ImGui::BeginChild( "RemoteClientInfoWindow", ImVec2(remote_client_info_window_width, remote_client_info_window_height), - ImGuiChildFlags_Border, + ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus); ImGui::PopStyleVar(); @@ -376,4 +376,4 @@ int Render::RemoteClientInfoWindow() { return 0; } -} // namespace crossdesk \ No newline at end of file +} // namespace crossdesk diff --git a/src/gui/windows/update_notification_window.cpp b/src/gui/windows/update_notification_window.cpp index 9f1dffc..790ebce 100644 --- a/src/gui/windows/update_notification_window.cpp +++ b/src/gui/windows/update_notification_window.cpp @@ -120,7 +120,7 @@ int Render::UpdateNotificationWindow() { ImGui::BeginChild( "ScrollableContent", ImVec2(update_notification_window_width * 0.9f, scrollable_height), - ImGuiChildFlags_Border, ImGuiWindowFlags_None); + ImGuiChildFlags_Borders, ImGuiWindowFlags_None); ImGui::SetWindowFontScale(0.5f); // set text wrap position to current available width (accounts for // scrollbar) @@ -204,3 +204,4 @@ int Render::UpdateNotificationWindow() { } } // namespace crossdesk +