YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-04-07 18:35:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix typo ImGuiChildFlags_Border to ImGuiChildFlags_Borders

Browse Source
This commit is contained in:
dijunkun
2026-03-19 16:16:51 +08:00
parent 8e8a85bae3
commit d017561e54
10 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/panels/local_peer_panel.cpp
View File

@@ -46,7 +46,7 @@ int Render::LocalWindow() {
ImGui::BeginChild( ImGui::BeginChild(
"LocalDesktopPanel", "LocalDesktopPanel",
ImVec2(local_window_width * 0.8f, local_window_height * 0.43f), ImVec2(local_window_width * 0.8f, local_window_height * 0.43f),
ImGuiChildFlags_Border, ImGuiChildFlags_Borders,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoBringToFrontOnFocus); ImGuiWindowFlags_NoBringToFrontOnFocus);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@@ -300,4 +300,4 @@ int Render::LocalWindow() {
return 0; return 0;
} }
} // namespace crossdesk } // namespace crossdesk

6
src/gui/panels/recent_connections_panel.cpp
View File

@@ -17,7 +17,7 @@ int Render::RecentConnectionsWindow() {
ImGui::BeginChild( ImGui::BeginChild(
"RecentConnectionsWindow", "RecentConnectionsWindow",
ImVec2(recent_connection_window_width, recent_connection_window_height), ImVec2(recent_connection_window_width, recent_connection_window_height),
ImGuiChildFlags_Border, ImGuiChildFlags_Borders,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoBringToFrontOnFocus); ImGuiWindowFlags_NoBringToFrontOnFocus);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@@ -64,7 +64,7 @@ int Render::ShowRecentConnections() {
ImGui::BeginChild( ImGui::BeginChild(
"RecentConnectionsContainer", "RecentConnectionsContainer",
ImVec2(recent_connection_panel_width, recent_connection_panel_height), ImVec2(recent_connection_panel_width, recent_connection_panel_height),
ImGuiChildFlags_Border, ImGuiChildFlags_Borders,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoBringToFrontOnFocus |
ImGuiWindowFlags_AlwaysHorizontalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar |
@@ -360,4 +360,4 @@ int Render::OfflineWarningWindow() {
ImGui::PopStyleVar(); ImGui::PopStyleVar();
return 0; return 0;
} }
} // namespace crossdesk } // namespace crossdesk

4
src/gui/panels/remote_peer_panel.cpp
View File

@@ -48,7 +48,7 @@ int Render::RemoteWindow() {
ImGui::BeginChild( ImGui::BeginChild(
"RemoteDesktopWindow_1", "RemoteDesktopWindow_1",
ImVec2(remote_window_width * 0.8f, remote_window_height * 0.43f), ImVec2(remote_window_width * 0.8f, remote_window_height * 0.43f),
ImGuiChildFlags_Border, ImGuiChildFlags_Borders,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoBringToFrontOnFocus); ImGuiWindowFlags_NoBringToFrontOnFocus);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@@ -270,4 +270,4 @@ int Render::ConnectTo(const std::string& remote_id, const char* password,
return 0; return 0;
} }
} // namespace crossdesk } // namespace crossdesk

4
src/gui/toolbars/status_bar.cpp
View File

@@ -16,7 +16,7 @@ int Render::StatusBar() {
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 0.0f)); 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::PushStyleColor(ImGuiCol_Border, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
ImGui::BeginChild("StatusBar", ImVec2(status_bar_width, status_bar_height), ImGui::BeginChild("StatusBar", ImVec2(status_bar_width, status_bar_height),
ImGuiChildFlags_Border, ImGuiChildFlags_Borders,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoBringToFrontOnFocus); ImGuiWindowFlags_NoBringToFrontOnFocus);
ImGui::PopStyleColor(2); ImGui::PopStyleColor(2);
@@ -45,4 +45,4 @@ int Render::StatusBar() {
ImGui::EndChild(); ImGui::EndChild();
return 0; return 0;
} }
} // namespace crossdesk } // namespace crossdesk

4
src/gui/toolbars/title_bar.cpp
View File

@@ -51,7 +51,7 @@ int Render::TitleBar(bool main_window) {
ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always); ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
ImGui::BeginChild(main_window ? "MainTitleBar" : "StreamTitleBar", ImGui::BeginChild(main_window ? "MainTitleBar" : "StreamTitleBar",
ImVec2(title_bar_width, title_bar_height_padding), ImVec2(title_bar_width, title_bar_height_padding),
ImGuiChildFlags_Border, ImGuiChildFlags_Borders,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoBringToFrontOnFocus); ImGuiWindowFlags_NoBringToFrontOnFocus);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@@ -329,4 +329,4 @@ int Render::TitleBar(bool main_window) {
ImGui::EndChild(); ImGui::EndChild();
return 0; return 0;
} }
} // namespace crossdesk } // namespace crossdesk

3
src/gui/windows/control_window.cpp
View File

@@ -224,7 +224,7 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
ImGui::BeginChild( ImGui::BeginChild(
control_child_window_title.c_str(), control_child_window_title.c_str(),
ImVec2(props->control_window_width_, props->control_window_height_), ImVec2(props->control_window_width_, props->control_window_height_),
ImGuiChildFlags_Border, ImGuiWindowFlags_NoDecoration); ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration);
ImGui::PopStyleColor(); ImGui::PopStyleColor();
props->control_window_pos_ = ImGui::GetWindowPos(); props->control_window_pos_ = ImGui::GetWindowPos();
@@ -257,3 +257,4 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
return 0; return 0;
} }
} // namespace crossdesk } // namespace crossdesk

3
src/gui/windows/file_transfer_window.cpp
View File

@@ -130,7 +130,7 @@ int Render::FileTransferWindow(
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.5f);
ImGui::BeginChild( ImGui::BeginChild(
"FileList", ImVec2(0, file_transfer_window_height * 0.75f), "FileList", ImVec2(0, file_transfer_window_height * 0.75f),
ImGuiChildFlags_Border, ImGuiWindowFlags_HorizontalScrollbar); ImGuiChildFlags_Borders, ImGuiWindowFlags_HorizontalScrollbar);
ImGui::SetWindowFontScale(1.0f); ImGui::SetWindowFontScale(1.0f);
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.5f);
@@ -242,3 +242,4 @@ int Render::FileTransferWindow(
} }
} // namespace crossdesk } // namespace crossdesk

4
src/gui/windows/main_window.cpp
View File

@@ -19,7 +19,7 @@ int Render::MainWindow() {
ImGui::BeginChild( ImGui::BeginChild(
"DeskWindow", "DeskWindow",
ImVec2(local_remote_window_width, local_remote_window_height), ImVec2(local_remote_window_width, local_remote_window_height),
ImGuiChildFlags_Border, ImGuiChildFlags_Borders,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoBringToFrontOnFocus); ImGuiWindowFlags_NoBringToFrontOnFocus);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@@ -57,4 +57,4 @@ int Render::MainWindow() {
return 0; return 0;
} }
} // namespace crossdesk } // namespace crossdesk

6
src/gui/windows/server_window.cpp
View File

@@ -66,7 +66,7 @@ int Render::ServerWindow() {
ImGui::BeginChild( ImGui::BeginChild(
"ServerTitleBar", "ServerTitleBar",
ImVec2(server_window_width_, server_window_title_bar_height_), ImVec2(server_window_width_, server_window_title_bar_height_),
ImGuiChildFlags_Border, ImGuiChildFlags_Borders,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoBringToFrontOnFocus); ImGuiWindowFlags_NoBringToFrontOnFocus);
@@ -140,7 +140,7 @@ int Render::RemoteClientInfoWindow() {
ImGui::BeginChild( ImGui::BeginChild(
"RemoteClientInfoWindow", "RemoteClientInfoWindow",
ImVec2(remote_client_info_window_width, remote_client_info_window_height), ImVec2(remote_client_info_window_width, remote_client_info_window_height),
ImGuiChildFlags_Border, ImGuiChildFlags_Borders,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoBringToFrontOnFocus); ImGuiWindowFlags_NoBringToFrontOnFocus);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
@@ -376,4 +376,4 @@ int Render::RemoteClientInfoWindow() {
return 0; return 0;
} }
} // namespace crossdesk } // namespace crossdesk

3
src/gui/windows/update_notification_window.cpp
View File

@@ -120,7 +120,7 @@ int Render::UpdateNotificationWindow() {
ImGui::BeginChild( ImGui::BeginChild(
"ScrollableContent", "ScrollableContent",
ImVec2(update_notification_window_width * 0.9f, scrollable_height), ImVec2(update_notification_window_width * 0.9f, scrollable_height),
ImGuiChildFlags_Border, ImGuiWindowFlags_None); ImGuiChildFlags_Borders, ImGuiWindowFlags_None);
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.5f);
// set text wrap position to current available width (accounts for // set text wrap position to current available width (accounts for
// scrollbar) // scrollbar)
@@ -204,3 +204,4 @@ int Render::UpdateNotificationWindow() {
} }
} // namespace crossdesk } // namespace crossdesk