Fix editor menu items swapping positions

nerudaj · Feb 9, 2024 · ebefd82 · ebefd82
1 parent b0c14b0
commit ebefd82
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/lib-editor/src/Editor/Editor.cpp b/src/lib-editor/src/Editor/Editor.cpp
@@ -44,9 +44,9 @@ Editor::Editor(
         level.mesh.layerWidth, level.mesh.layerHeight, level.mesh.tileWidth);
     configureMouseIndicator();
     configureMeshTool(level);
+    populateMenuBar();
     switchTool(EditorState::Mesh);
     configureItemTool(level);
-    populateMenuBar();
     configureCanvasCallbacks();
 }
 
@@ -107,8 +107,13 @@ void Editor::populateMenuBar()
 
     auto menu = gui->gui.get<tgui::MenuBar>("TopMenuBar");
 
+    if (!menu->getMenuEnabled(MENU_NAME))
+    {
+        menu->addMenu(MENU_NAME);
+    }
+
     // Cleanup previously built data
-    menu->removeMenu(MENU_NAME);
+    menu->removeMenuItems(MENU_NAME);
     shortcutEngine->unregisterShortcutGroup(MENU_NAME);
 
     auto addEditorMenuItem =
@@ -117,7 +122,7 @@ void Editor::populateMenuBar()
             sf::Keyboard::Key shortcut = sf::Keyboard::KeyCount,
             bool ctrlRequired = false)
     {
-        menu->addMenuItem(label);
+        menu->addMenuItem(MENU_NAME, label);
         menu->connectMenuItem(MENU_NAME, label, callback);
 
         if (shortcut != sf::Keyboard::KeyCount)
@@ -128,7 +133,6 @@ void Editor::populateMenuBar()
     using namespace Strings::Editor::ContextMenu;
 
     // Build menu
-    menu->addMenu(MENU_NAME);
     addEditorMenuItem(
         MESH_MODE, [this] { switchTool(EditorState::Mesh); }, sf::Keyboard::M);
     addEditorMenuItem(

diff --git a/src/lib-editor/src/Tools/ToolInterface.cpp b/src/lib-editor/src/Tools/ToolInterface.cpp
@@ -6,7 +6,11 @@ void ToolInterface::buildCtxMenu(tgui::MenuBar::Ptr& menu)
 {
     destroyCtxMenu(menu);
     shortcutEngine->unregisterShortcutGroup(CTX_MENU_NAME);
-    menu->addMenu(CTX_MENU_NAME);
+
+    if (!menu->getMenuEnabled(CTX_MENU_NAME))
+    {
+        menu->addMenu(CTX_MENU_NAME);
+    }
     buildCtxMenuInternal(menu);
 }
 
@@ -16,7 +20,7 @@ void ToolInterface::addCtxMenuItem(
     std::function<void(void)> callback,
     sf::Keyboard::Key key)
 {
-    menu->addMenuItem(label);
+    menu->addMenuItem(CTX_MENU_NAME, label);
     ctxMenuSignalHandlers.push_back(
         menu->connectMenuItem(CTX_MENU_NAME, label, callback));
     shortcutEngine->registerShortcut(
@@ -30,7 +34,7 @@ void ToolInterface::destroyCtxMenu(tgui::MenuBar::Ptr& menu)
         menu->disconnect(id);*/
 
     ctxMenuSignalHandlers.clear();
-    menu->removeMenu(CTX_MENU_NAME);
+    menu->removeMenuItems(CTX_MENU_NAME);
 }
 
 sf::Vector2i Helper::minVector(const sf::Vector2i& a, const sf::Vector2i& b)