From 93d0e3a5d0b7d5db78952e91e5dc82946f812bdf Mon Sep 17 00:00:00 2001 From: dijunkun Date: Tue, 28 May 2024 17:37:06 +0800 Subject: [PATCH] Auto collapse menu bar when connection established --- src/gui/main.cpp | 11 ++++++++--- thirdparty/projectx | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 485a2c4..4c68a9b 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -623,9 +623,14 @@ int main(int argc, char *argv[]) { #endif #if CHINESE_FONT - ImGui::Begin(u8"菜单", nullptr, - ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | - ImGuiWindowFlags_NoMove); + if (!joined) { + ImGui::Begin(u8"菜单", nullptr, + ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | + ImGuiWindowFlags_NoMove); + } else { + ImGui::SetNextWindowCollapsed(true, ImGuiCond_Once); + ImGui::Begin(u8"菜单", nullptr, ImGuiWindowFlags_None); + } #else ImGui::Begin("Menu", nullptr, ImGuiWindowFlags_NoResize); #endif diff --git a/thirdparty/projectx b/thirdparty/projectx index 3ea4d07..9122d0d 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit 3ea4d0724d20beeb2c582cd136d879bb6b5fd4ef +Subproject commit 9122d0d15f3b3094e613cdfc372c7f8a0f6b6d62