Fix: Menu inside editor window. v0.2.32

Author: djwisdom

VERSION

@@ -1 +1 @@
-0.2.31
+0.2.32

imgui.ini

@@ -1,8 +1,8 @@
 [Window][Editor]
-Pos=228,24
-Size=1052,776
+Pos=323,-1
+Size=957,800
 Collapsed=0
-DockId=0xCCBD8CF7
+DockId=0x00000014,0
 
 [Window][DockSpace]
 Size=1280,800
@@ -19,34 +19,22 @@ Size=476,221
 Collapsed=0
 
 [Window][Explorer]
-Pos=41,683
-Size=356,600
+Pos=0,-1
+Size=321,800
 Collapsed=0
-DockId=0x00000005,0
+DockId=0x00000013,0
 
 [Window][MainDock]
+Size=1280,800
+Collapsed=0
+
+[Window][pcode-editor]
 Pos=0,0
 Size=1280,800
 Collapsed=0
 
 [Docking][Data]
-DockNode                  ID=0x00000005 Pos=41,683 Size=356,600
-DockSpace                 ID=0x44CD06D0 Window=0x18D25B74 Pos=0,24 Size=1280,776 CentralNode=1
-DockSpace                 ID=0xCCBD8CF7 Pos=0,24 Size=1280,776 Split=X Selected=0xDF0EC458
-  DockNode                ID=0x00000011 Parent=0xCCBD8CF7 SizeRef=1306,851 Split=Y
-    DockNode              ID=0x0000000F Parent=0x00000011 SizeRef=1280,480 Split=Y
-      DockNode            ID=0x0000000D Parent=0x0000000F SizeRef=1280,472 Split=Y
-        DockNode          ID=0x0000000B Parent=0x0000000D SizeRef=1280,720 Split=Y
-          DockNode        ID=0x00000009 Parent=0x0000000B SizeRef=1280,686 Split=Y
-            DockNode      ID=0x00000007 Parent=0x00000009 SizeRef=1280,703 Split=Y
-              DockNode    ID=0x00000001 Parent=0x00000007 SizeRef=1280,386 Selected=0x00F0E82E
-              DockNode    ID=0x00000002 Parent=0x00000007 SizeRef=1280,261 Split=X
-                DockNode  ID=0x00000003 Parent=0x00000002 SizeRef=678,778 CentralNode=1 Selected=0xDF0EC458
-                DockNode  ID=0x00000004 Parent=0x00000002 SizeRef=600,778 Selected=0xD33228A6
-            DockNode      ID=0x00000008 Parent=0x00000009 SizeRef=1280,64 HiddenTabBar=1 Selected=0x2AB9DED9
-          DockNode        ID=0x0000000A Parent=0x0000000B SizeRef=1280,81 HiddenTabBar=1 Selected=0x2AB9DED9
-        DockNode          ID=0x0000000C Parent=0x0000000D SizeRef=1280,47 HiddenTabBar=1 Selected=0x2AB9DED9
-      DockNode            ID=0x0000000E Parent=0x0000000F SizeRef=1280,300 Selected=0xD33228A6
-    DockNode              ID=0x00000010 Parent=0x00000011 SizeRef=1280,300 Selected=0xD33228A6
-  DockNode                ID=0x00000012 Parent=0xCCBD8CF7 SizeRef=612,851 Selected=0xD33228A6
+DockNode    ID=0x00000001 Pos=0,-1 Size=1280,800 Split=X
+  DockNode  ID=0x00000013 Parent=0x00000001 SizeRef=257,800 Selected=0x00F0E82E
+  DockNode  ID=0x00000014 Parent=0x00000001 SizeRef=766,800 Selected=0xDF0EC458
 

pcode-settings.json

@@ -13,5 +13,5 @@
   "font_size": 17,
   "font_name": "CascadiaMono",
   "last_open_dir": ".\\src",
-  "recent_files": [".\\src\\main.cpp", ".\\src\\editor_app.cpp", ".\\src\\editor_app.h", ".\\docs\\versioning.md", ".\\docs\\imgui_tutorial.md", ".\\docs\\VIM_MOTIONS_SPEC.md", "./src/editor_app.h", "./src/main.cpp", "./src/editor_app.cpp", "VERSION"]
+  "recent_files": [".\\src\\editor_app.cpp", ".\\src\\main.cpp", ".\\src\\editor_app.h", ".\\docs\\versioning.md", ".\\docs\\imgui_tutorial.md", ".\\docs\\VIM_MOTIONS_SPEC.md", "./src/editor_app.h", "./src/main.cpp", "./src/editor_app.cpp", "VERSION"]
 }

src/editor_app.cpp

@@ -159,7 +159,7 @@ static void settings_load(AppSettings& s, const std::string& path) {
 // Version
 // ============================================================================
 std::string EditorApp::get_version() {
-    return "pCode Editor version 0.2.30";
+    return "pCode Editor version 0.2.31";
 }
 
 // ============================================================================
@@ -1786,14 +1786,13 @@ void EditorApp::render() {
         }
     }
 
-// Main window with menu and sidebar
+// Main window - just sidebar
     ImGuiViewport* viewport = ImGui::GetMainViewport();
     ImGui::SetNextWindowPos(viewport->Pos);
     ImGui::SetNextWindowSize(viewport->Size);
     ImGui::SetNextWindowViewport(viewport->ID);
 
-    ImGuiWindowFlags flags = ImGuiWindowFlags_MenuBar;
-    flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse;
+    ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse;
     flags |= ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove;
 
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0);
@@ -1802,16 +1801,16 @@ void EditorApp::render() {
     ImGui::Begin("pcode-editor", nullptr, flags);
     ImGui::PopStyleVar(3);
 
-    render_menu_bar();
     render_sidebar();
 
     ImGui::End();
 
-    // Editor as independent floating window - fully movable
+    // Editor as independent floating window - fully movable, with menu inside
     ImGui::SetNextWindowPos(ImVec2(viewport->Pos.x + 80, viewport->Pos.y + 80), ImGuiCond_FirstUseEver);
     ImGui::SetNextWindowSize(ImVec2(800, 600), ImGuiCond_FirstUseEver);
 
-    if (ImGui::Begin("Editor", nullptr, ImGuiWindowFlags_NoCollapse)) {
+    if (ImGui::Begin("Editor", nullptr, ImGuiWindowFlags_MenuBar)) {
+        render_menu_bar();
         render_editor_area();
         ImGui::End();
     }
@@ -2796,7 +2795,7 @@ void EditorApp::render_status_bar() {
         ImGui::SameLine();
 
         // Version with git hash
-        ImGui::Text("v0.2.31");
+        ImGui::Text("v0.2.32");
     }
 
 ImGui::PopStyleColor();