Skip to content

Commit a7afbb1

Browse files
committed
Fix: Enable docking by removing NoDocking flag from DockSpace
1 parent 291dfd6 commit a7afbb1

3 files changed

Lines changed: 29 additions & 26 deletions

File tree

imgui.ini

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Pos=0,26
33
Size=1280,774
44
Collapsed=0
5-
DockId=0x00000003,0
5+
DockId=0x00000003
66

77
[Window][DockSpace]
88
Pos=0,0
9-
Size=1280,800
9+
Size=1042,463
1010
Collapsed=0
1111

1212
[Window][Debug##Default]
@@ -20,26 +20,29 @@ Size=501,229
2020
Collapsed=0
2121

2222
[Window][Explorer]
23-
Pos=932,346
24-
Size=251,720
23+
Pos=0,26
24+
Size=250,437
2525
Collapsed=0
26+
DockId=0x00000005,0
2627

2728
[Docking][Data]
28-
DockSpace ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,26 Size=1280,774 Split=X Selected=0xDF0EC458
29-
DockNode ID=0x00000011 Parent=0xCCBD8CF7 SizeRef=1306,851 Split=Y
30-
DockNode ID=0x0000000F Parent=0x00000011 SizeRef=1280,480 Split=Y
31-
DockNode ID=0x0000000D Parent=0x0000000F SizeRef=1280,472 Split=Y
32-
DockNode ID=0x0000000B Parent=0x0000000D SizeRef=1280,720 Split=Y
33-
DockNode ID=0x00000009 Parent=0x0000000B SizeRef=1280,686 Split=Y
34-
DockNode ID=0x00000007 Parent=0x00000009 SizeRef=1280,703 Split=Y
35-
DockNode ID=0x00000001 Parent=0x00000007 SizeRef=1280,386 Selected=0x00F0E82E
36-
DockNode ID=0x00000002 Parent=0x00000007 SizeRef=1280,261 Split=X
37-
DockNode ID=0x00000003 Parent=0x00000002 SizeRef=678,778 CentralNode=1 Selected=0xDF0EC458
38-
DockNode ID=0x00000004 Parent=0x00000002 SizeRef=600,778 Selected=0xD33228A6
39-
DockNode ID=0x00000008 Parent=0x00000009 SizeRef=1280,64 HiddenTabBar=1 Selected=0x2AB9DED9
40-
DockNode ID=0x0000000A Parent=0x0000000B SizeRef=1280,81 HiddenTabBar=1 Selected=0x2AB9DED9
41-
DockNode ID=0x0000000C Parent=0x0000000D SizeRef=1280,47 HiddenTabBar=1 Selected=0x2AB9DED9
42-
DockNode ID=0x0000000E Parent=0x0000000F SizeRef=1280,300 Selected=0xD33228A6
43-
DockNode ID=0x00000010 Parent=0x00000011 SizeRef=1280,300 Selected=0xD33228A6
44-
DockNode ID=0x00000012 Parent=0xCCBD8CF7 SizeRef=612,851 Selected=0xD33228A6
29+
DockSpace ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,26 Size=1042,437 Split=X Selected=0xDF0EC458
30+
DockNode ID=0x00000005 Parent=0xCCBD8CF7 SizeRef=250,774 Selected=0x00F0E82E
31+
DockNode ID=0x00000006 Parent=0xCCBD8CF7 SizeRef=1028,774 Split=X
32+
DockNode ID=0x00000011 Parent=0x00000006 SizeRef=1306,851 Split=Y
33+
DockNode ID=0x0000000F Parent=0x00000011 SizeRef=1280,480 Split=Y
34+
DockNode ID=0x0000000D Parent=0x0000000F SizeRef=1280,472 Split=Y
35+
DockNode ID=0x0000000B Parent=0x0000000D SizeRef=1280,720 Split=Y
36+
DockNode ID=0x00000009 Parent=0x0000000B SizeRef=1280,686 Split=Y
37+
DockNode ID=0x00000007 Parent=0x00000009 SizeRef=1280,703 Split=Y
38+
DockNode ID=0x00000001 Parent=0x00000007 SizeRef=1280,386 Selected=0x00F0E82E
39+
DockNode ID=0x00000002 Parent=0x00000007 SizeRef=1280,261 Split=X
40+
DockNode ID=0x00000003 Parent=0x00000002 SizeRef=678,778 CentralNode=1 Selected=0xDF0EC458
41+
DockNode ID=0x00000004 Parent=0x00000002 SizeRef=600,778 Selected=0xD33228A6
42+
DockNode ID=0x00000008 Parent=0x00000009 SizeRef=1280,64 HiddenTabBar=1 Selected=0x2AB9DED9
43+
DockNode ID=0x0000000A Parent=0x0000000B SizeRef=1280,81 HiddenTabBar=1 Selected=0x2AB9DED9
44+
DockNode ID=0x0000000C Parent=0x0000000D SizeRef=1280,47 HiddenTabBar=1 Selected=0x2AB9DED9
45+
DockNode ID=0x0000000E Parent=0x0000000F SizeRef=1280,300 Selected=0xD33228A6
46+
DockNode ID=0x00000010 Parent=0x00000011 SizeRef=1280,300 Selected=0xD33228A6
47+
DockNode ID=0x00000012 Parent=0x00000006 SizeRef=612,851 Selected=0xD33228A6
4548

pcode-settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
"font_size": 18,
1414
"font_name": "CascadiaMono",
1515
"last_open_dir": ".\\src",
16-
"recent_files": [".\\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", "./CMakeLists.txt"]
16+
"recent_files": [".\\src\\editor_app.h", ".\\src\\editor_app.cpp", ".\\docs\\versioning.md", ".\\docs\\imgui_tutorial.md", ".\\docs\\VIM_MOTIONS_SPEC.md", "./src/editor_app.h", "./src/main.cpp", "./src/editor_app.cpp", "VERSION", "./CMakeLists.txt"]
1717
}

src/editor_app.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,7 @@ void EditorApp::render() {
17921792
ImGui::SetNextWindowSize(viewport->Size);
17931793
ImGui::SetNextWindowViewport(viewport->ID);
17941794

1795-
ImGuiWindowFlags flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking;
1795+
ImGuiWindowFlags flags = ImGuiWindowFlags_MenuBar;
17961796
flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse;
17971797
flags |= ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove;
17981798
flags |= ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
@@ -1804,7 +1804,7 @@ void EditorApp::render() {
18041804
ImGui::PopStyleVar(3);
18051805

18061806
ImGuiID dockspace_id = ImGui::GetID("MainDockSpace");
1807-
ImGui::DockSpace(dockspace_id, ImVec2(0, 0), ImGuiDockNodeFlags_PassthruCentralNode | ImGuiDockNodeFlags_DockSpace);
1807+
ImGui::DockSpace(dockspace_id, ImVec2(0, 0), ImGuiDockNodeFlags_PassthruCentralNode);
18081808
ImGui::DockBuilderDockWindow("Editor", dockspace_id);
18091809

18101810
render_menu_bar();
@@ -2031,8 +2031,8 @@ ImGui::EndMenu();
20312031
// Editor Area
20322032
// ============================================================================
20332033
void EditorApp::render_editor_area() {
2034-
// Editor window - can float and dock
2035-
ImGui::Begin("Editor", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse);
2034+
// Editor window - can float, dock, and resize
2035+
ImGui::Begin("Editor", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize);
20362036

20372037
if (ImGui::IsWindowFocused(ImGuiFocusedFlags_RootWindow)) {
20382038
editor_focused_ = true;

0 commit comments

Comments
 (0)