Rework GUI for menus. Fix bugs

Author: weenchvd

Source/Menu/AttributeMenu/gui_menuAttribute.cpp

@@ -173,6 +173,16 @@ void guiMenuAttribute(bool* open, GuiMenuGeneralVars& gVars)
     static common::Text description{};
     static GuiMenuAttributeState state{ gVars, vars };
 
+    if (showGuiQuestionUndoChanges) {
+        YesNo result{ YesNo::INVALID };
+        guiGetYesNo(&showGuiQuestionUndoChanges, u8"##QuestionUndoChanges",
+            text.questionUndoChanges().c_str(), result);
+        if (result == YesNo::YES) {
+            pChar->attribute().reject();
+        }
+        return;
+    }
+
     ///********** Windows
     ImGuiWindowFlags window_flags{ 0 };
     guiCommonInitialization(window_flags);
@@ -315,15 +325,6 @@ void guiMenuAttribute(bool* open, GuiMenuGeneralVars& gVars)
                 showGuiQuestionUndoChanges = true;
             }
         }
-
-        if (showGuiQuestionUndoChanges) {
-            YesNo result{ YesNo::INVALID };
-            guiGetYesNo(&showGuiQuestionUndoChanges, u8"##QuestionUndoChanges",
-                text.questionUndoChanges().c_str(), result);
-            if (result == YesNo::YES) {
-                pChar->attribute().reject();
-            }
-        }
     }
     ImGui::End();
 }

Source/Menu/GeneralMenu/gui_menuGeneral.cpp

@@ -226,13 +226,13 @@ void guiWindowUnit(GuiMenuGeneralVars& gVars,
                         break;
                     }
                 }
-                int totalWidth =
-                    windowSize.x - style.WindowPadding.x * 2.0f - style.ScrollbarSize;
+                int totalWidth = ImGui::GetWindowContentRegionMax().x - style.WindowPadding.x;
                 guiShowStats(*pChar, sign::dot, totalWidth);
             }
             else if (gVars.curSM_ == Submenu::INVENTORY) {
                 ImVec2 buttonSize{
-                    windowSize.x - style.ItemSpacing.x * 2.0f, ImGui::GetFrameHeight()
+                    ImGui::GetWindowContentRegionMax().x - style.WindowPadding.x,
+                    ImGui::GetFrameHeight()
                 };
                 ostringstream oss;
                 for (int i = 0; i < pChar->slotWeapon().size(); ++i) {

Source/Menu/InventoryMenu/gui_menuInventory.cpp

@@ -91,9 +91,13 @@ void guiMenuInventory(bool* open, GuiMenuGeneralVars& gVars)
         if (itemIsSelected && !iItem.isValid()) {
             pItem = nullptr;
         }
+        return;
     }
 
-    if (showGuiModifyItem) guiMenuItemModify(&showGuiModifyItem, squad, *pItem);
+    if (showGuiModifyItem) {
+        guiMenuItemModify(&showGuiModifyItem, squad, *pItem);
+        return;
+    }
 
     if (showGuiEquipItem) {
         auto newMod{ squad.inventory().extract(iItem) };

Source/Menu/MainMenu/gui_menuMain.cpp

@@ -36,10 +36,11 @@ void guiMenuMain(bool* open,
     static bool showGuiMenuSaveGame     { false };
     static bool showGuiMenuLoadGame     { false };
 
-    if (showGuiMenuOption)              guiMenuOptions(&showGuiMenuOption);
-    if (showGuiMenuGeneral)             guiMenuGeneral(&showGuiMenuGeneral, *squad);
-    if (showGuiMenuSaveGame)            guiMenuSaveGame(&showGuiMenuSaveGame, squad, shop);
-    if (showGuiMenuLoadGame)            guiMenuLoadGame(&showGuiMenuLoadGame, squad, shop);
+    ///********** Show GUI
+    if (showGuiMenuOption)              { guiMenuOptions(&showGuiMenuOption); return; }
+    if (showGuiMenuGeneral)             { guiMenuGeneral(&showGuiMenuGeneral, *squad); return; }
+    if (showGuiMenuSaveGame)            { guiMenuSaveGame(&showGuiMenuSaveGame, squad, shop); return; }
+    if (showGuiMenuLoadGame)            { guiMenuLoadGame(&showGuiMenuLoadGame, squad, shop); return; }
 
     ImGuiWindowFlags window_flags{ 0 };
     guiCommonInitialization(window_flags);

Source/Menu/SkillMenu/gui_menuSkill.cpp

@@ -173,6 +173,16 @@ void guiMenuSkill(bool* open, GuiMenuGeneralVars& gVars)
     static common::Text description{};
     static GuiMenuSkillState state{ gVars, vars };
 
+    if (showGuiQuestionUndoChanges) {
+        YesNo result{ YesNo::INVALID };
+        guiGetYesNo(&showGuiQuestionUndoChanges, u8"##QuestionUndoChanges",
+            text.questionUndoChanges().c_str(), result);
+        if (result == YesNo::YES) {
+            pChar->skill().reject();
+        }
+        return;
+    }
+
     ///********** Windows
     ImGuiWindowFlags window_flags{ 0 };
     guiCommonInitialization(window_flags);
@@ -314,15 +324,6 @@ void guiMenuSkill(bool* open, GuiMenuGeneralVars& gVars)
                 showGuiQuestionUndoChanges = true;
             }
         }
-
-        if (showGuiQuestionUndoChanges) {
-            YesNo result{ YesNo::INVALID };
-            guiGetYesNo(&showGuiQuestionUndoChanges, u8"##QuestionUndoChanges",
-                text.questionUndoChanges().c_str(), result);
-            if (result == YesNo::YES) {
-                pChar->skill().reject();
-            }
-        }
     }
     ImGui::End();
 }

Source/Menu/gui_menuCommon.cpp

@@ -84,41 +84,40 @@ void guiGetYesNo(bool* open,
     assert(messageText != nullptr);
     if (open == nullptr || windowTitle == nullptr || messageText == nullptr) return;
 
-    const auto& comT{ MenuCommonText::common() };
-
-    ImVec2 center{ ImGui::GetMainViewport()->GetCenter() };
-    ImGui::SetNextWindowPos(center, ImGuiCond_Appearing, ImVec2{ 0.5f, 0.5f });
-    const float textPadding{ 20 };
-    const float windowWidth{ ImGui::CalcTextSize(messageText).x + textPadding };
-    const float minWindowWidth{ 300 };
-    ImVec2 windowSize{ max(windowWidth, minWindowWidth), 0 };
-    ImGui::SetNextWindowSize(windowSize, ImGuiCond_Always);
-
-    ImGuiWindowFlags window_flags{ ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings };
-    if (ImGui::Begin(windowTitle, open, window_flags)) {
+    ImGuiWindowFlags window_flags{ 0 };
+    guiCommonInitialization(window_flags);
+    window_flags &= ~ImGuiWindowFlags_NoBringToFrontOnFocus;
+
+    string s{ string{ windowTitle } + u8"###YesNo" };
+    if (ImGui::Begin(s.c_str(), nullptr, window_flags)) {
+        const auto& comT{ MenuCommonText::common() };
+
+        ImVec2 center{ ImGui::GetMainViewport()->GetCenter() };
+        const float textWidth{ ImGui::CalcTextSize(messageText).x };
+        ImVec2 textPos{ center.x - textWidth / 2, center.y - ImGui::GetFrameHeight() };
+        ImGui::SetCursorScreenPos(textPos);
         ImGui::Text(messageText);
 
-        const float buttonTextPadding{ 40 };
+        const float buttonTextPadding{ 40.0f };
         const char* buttonTextYes{ comT.yes().c_str() };
-        ImVec2 buttonSizeYes{ ImGui::CalcTextSize(buttonTextYes).x + buttonTextPadding, 0 };
+        ImVec2 buttonSizeYes{ ImGui::CalcTextSize(buttonTextYes).x + buttonTextPadding, 0.0f };
         const char* buttonTextNo{ comT.no().c_str() };
-        ImVec2 buttonSizeNo{ ImGui::CalcTextSize(buttonTextNo).x + buttonTextPadding, 0 };
+        ImVec2 buttonSizeNo{ ImGui::CalcTextSize(buttonTextNo).x + buttonTextPadding, 0.0f };
 
-        const float buttonPadding{ 10 };
-        ImVec2 buttonSize{ max(buttonSizeYes.x, buttonSizeNo.x), 0 };
+        const float buttonPadding{ 10.0f };
+        ImVec2 buttonSize{ max(buttonSizeYes.x, buttonSizeNo.x), 0.0f };
         float indent{ ImGui::GetWindowWidth() / 2 - buttonSize.x - buttonPadding };
-        ImGui::NewLine();
+        ImGui::Dummy(ImVec2{ 0.0f, ImGui::GetFrameHeight() });
         ImGui::SameLine(indent);
         if (ImGui::Button(buttonTextYes, buttonSize)) {
             result = YesNo::YES;
             *open = false;
         }
-        ImGui::SameLine(0, buttonPadding * 2);
+        ImGui::SameLine(0.0f, buttonPadding * 2);
         if (ImGui::Button(buttonTextNo, buttonSize)) {
             result = YesNo::NO;
             *open = false;
         }
-
     }
     ImGui::End();
 }