Fix: Editor now floats and can dock to main

Author: djwisdom

imgui.ini

@@ -5,7 +5,6 @@ Collapsed=0
 DockId=0xCCBD8CF7
 
 [Window][DockSpace]
-Pos=0,0
 Size=1280,800
 Collapsed=0
 
@@ -20,29 +19,33 @@ Size=476,221
 Collapsed=0
 
 [Window][Explorer]
-Pos=0,24
+Pos=1052,363
 Size=226,776
 Collapsed=0
 DockId=0x00000005,0
 
+[Window][MainDock]
+Pos=0,0
+Size=1280,800
+Collapsed=0
+
 [Docking][Data]
-DockSpace                   ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,24 Size=1280,776 Split=X Selected=0xDF0EC458
-  DockNode                  ID=0x00000005 Parent=0xCCBD8CF7 SizeRef=226,776 Selected=0x00F0E82E
-  DockNode                  ID=0x00000006 Parent=0xCCBD8CF7 SizeRef=1052,776 Split=X
-    DockNode                ID=0x00000011 Parent=0x00000006 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=0x00000006 SizeRef=612,851 Selected=0xD33228A6
+DockNode                  ID=0x00000005 Pos=1052,363 Size=226,776
+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
 

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.28";
+    return "pCode Editor version 0.2.29";
 }
 
 // ============================================================================
@@ -1786,7 +1786,7 @@ void EditorApp::render() {
         }
     }
 
-// Main dockspace window
+// Main dockspace window with docking support
     ImGuiViewport* viewport = ImGui::GetMainViewport();
     ImGui::SetNextWindowPos(viewport->Pos);
     ImGui::SetNextWindowSize(viewport->Size);
@@ -1802,21 +1802,27 @@ void EditorApp::render() {
     ImGui::Begin("MainDock", nullptr, flags);
     ImGui::PopStyleVar(3);
 
+    // Dockspace allows windows to dock into main
+    ImGuiID dockspace_id = ImGui::GetID("MainDockSpace");
+    ImGui::DockSpace(dockspace_id, ImVec2(0, 0), ImGuiDockNodeFlags_PassthruCentralNode);
+
     // Menu and sidebar in main window
     render_menu_bar();
     render_sidebar();
 
     ImGui::End();
 
-    // Floating editor window - can be dragged anywhere and docked
+    // Floating editor window - can float and dock to main window
     ImGui::SetNextWindowPos(ImVec2(viewport->Pos.x + 60, viewport->Pos.y + 60));
     ImGui::SetNextWindowSize(ImVec2(800, 600));
     ImGui::SetNextWindowViewport(viewport->ID);
 
-    ImGuiWindowFlags editor_flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings;
+    ImGuiWindowFlags editor_flags = ImGuiWindowFlags_NoSavedSettings;
     editor_flags |= ImGuiWindowFlags_UnsavedDocument;
 
     if (ImGui::Begin("Editor", nullptr, editor_flags)) {
+        // Register with dockspace for docking
+        ImGui::DockBuilderDockWindow("Editor", dockspace_id);
         render_editor_area();
         ImGui::End();
     }