YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 12:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix imgui layout error

Browse Source
This commit is contained in:
dijunkun
2024-11-01 15:57:15 +08:00
parent d18af6cbc6
commit 26fa53f867
4 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/single_window/local_peer_window.cpp
View File

@@ -302,7 +302,6 @@ int Render::LocalWindow() {
} }
ImGui::EndChild(); ImGui::EndChild();
ImGui::PopStyleVar();
} }
ImGui::EndChild(); ImGui::EndChild();

18
src/single_window/render.cpp
View File

@@ -518,8 +518,23 @@ int Render::Run() {
ImGui::PopStyleColor(); ImGui::PopStyleColor();
TitleBar(); TitleBar();
if (connection_established_ && streaming_ && is_client_mode_) {
if (!resizable_) {
resizable_ = !resizable_;
SDL_SetWindowResizable(main_window_, SDL_TRUE);
}
ControlWindow();
} else {
if (resizable_) {
resizable_ = !resizable_;
SDL_SetWindowResizable(main_window_, SDL_FALSE);
}
MainWindow();
} }
ImGui::End();
} else {
if (connection_established_ && streaming_ && is_client_mode_) { if (connection_established_ && streaming_ && is_client_mode_) {
if (!resizable_) { if (!resizable_) {
resizable_ = !resizable_; resizable_ = !resizable_;
@@ -534,9 +549,6 @@ int Render::Run() {
} }
MainWindow(); MainWindow();
} }
if (!fullscreen_button_pressed_) {
ImGui::End();
} }
// create connection // create connection

9
src/single_window/title_bar.cpp
View File

@@ -48,7 +48,6 @@ int Render::TitleBar() {
draw_list->AddLine(ImVec2(bar_pos_x, bar_pos_y + 6), draw_list->AddLine(ImVec2(bar_pos_x, bar_pos_y + 6),
ImVec2(bar_pos_x + menu_bar_line_size, bar_pos_y + 6), ImVec2(bar_pos_x + menu_bar_line_size, bar_pos_y + 6),
IM_COL32(0, 0, 0, 255)); IM_COL32(0, 0, 0, 255));
ImGui::PopStyleColor(2);
{ {
SettingWindow(); SettingWindow();
@@ -56,6 +55,8 @@ int Render::TitleBar() {
} }
} }
ImGui::PopStyleColor(2);
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0)); ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
ImGui::SetCursorPosX(main_window_width_ - (streaming_ ImGui::SetCursorPosX(main_window_width_ - (streaming_
? BUTTON_PADDING * 3 ? BUTTON_PADDING * 3
@@ -146,11 +147,13 @@ int Render::TitleBar() {
ImGui::PopStyleColor(2); ImGui::PopStyleColor(2);
ImGui::PopStyleColor(1); ImGui::PopStyleColor();
} }
ImGui::EndMenuBar();
ImGui::SetWindowFontScale(1.0f); ImGui::SetWindowFontScale(1.0f);
ImGui::EndChild(); ImGui::EndChild();
ImGui::PopStyleColor(2); ImGui::PopStyleColor();
return 0; return 0;
} }

2
xmake.lua
View File

@@ -17,7 +17,7 @@ if is_mode("debug") then
end end
add_requires("spdlog 1.14.1", {system = false}) add_requires("spdlog 1.14.1", {system = false})
add_requires("imgui v1.91.0", {configs = {sdl2 = true, sdl2_renderer = true}}) add_requires("imgui v1.91.4-docking", {configs = {sdl2 = true, sdl2_renderer = true}})
add_requires("miniaudio 0.11.21") add_requires("miniaudio 0.11.21")
if is_os("windows") then if is_os("windows") then