Skip to content

Commit 1d44171

Browse files
committed
Fix: Editor fully floating - can move anywhere. v0.2.31
1 parent f9eefc4 commit 1d44171

3 files changed

Lines changed: 15 additions & 25 deletions

File tree

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.30
1+
0.2.31

imgui.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Size=476,221
1919
Collapsed=0
2020

2121
[Window][Explorer]
22-
Pos=1052,363
23-
Size=226,776
22+
Pos=41,683
23+
Size=356,600
2424
Collapsed=0
2525
DockId=0x00000005,0
2626

@@ -30,7 +30,8 @@ Size=1280,800
3030
Collapsed=0
3131

3232
[Docking][Data]
33-
DockNode ID=0x00000005 Pos=1052,363 Size=226,776
33+
DockNode ID=0x00000005 Pos=41,683 Size=356,600
34+
DockSpace ID=0x44CD06D0 Window=0x18D25B74 Pos=0,24 Size=1280,776 CentralNode=1
3435
DockSpace ID=0xCCBD8CF7 Pos=0,24 Size=1280,776 Split=X Selected=0xDF0EC458
3536
DockNode ID=0x00000011 Parent=0xCCBD8CF7 SizeRef=1306,851 Split=Y
3637
DockNode ID=0x0000000F Parent=0x00000011 SizeRef=1280,480 Split=Y

src/editor_app.cpp

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ static void settings_load(AppSettings& s, const std::string& path) {
159159
// Version
160160
// ============================================================================
161161
std::string EditorApp::get_version() {
162-
return "pCode Editor version 0.2.29";
162+
return "pCode Editor version 0.2.30";
163163
}
164164

165165
// ============================================================================
@@ -1786,43 +1786,32 @@ void EditorApp::render() {
17861786
}
17871787
}
17881788

1789-
// Main dockspace window with docking support
1789+
// Main window with menu and sidebar
17901790
ImGuiViewport* viewport = ImGui::GetMainViewport();
17911791
ImGui::SetNextWindowPos(viewport->Pos);
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;
1797-
flags |= ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
1797+
flags |= ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove;
17981798

17991799
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0);
18001800
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0);
18011801
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
1802-
ImGui::Begin("MainDock", nullptr, flags);
1802+
ImGui::Begin("pcode-editor", nullptr, flags);
18031803
ImGui::PopStyleVar(3);
18041804

1805-
// Dockspace allows windows to dock into main
1806-
ImGuiID dockspace_id = ImGui::GetID("MainDockSpace");
1807-
ImGui::DockSpace(dockspace_id, ImVec2(0, 0), ImGuiDockNodeFlags_PassthruCentralNode);
1808-
1809-
// Menu and sidebar in main window
18101805
render_menu_bar();
18111806
render_sidebar();
18121807

18131808
ImGui::End();
18141809

1815-
// Floating editor window - can float and dock to main window
1816-
ImGui::SetNextWindowPos(ImVec2(viewport->Pos.x + 60, viewport->Pos.y + 60));
1817-
ImGui::SetNextWindowSize(ImVec2(800, 600));
1818-
ImGui::SetNextWindowViewport(viewport->ID);
1819-
1820-
ImGuiWindowFlags editor_flags = ImGuiWindowFlags_NoSavedSettings;
1821-
editor_flags |= ImGuiWindowFlags_UnsavedDocument;
1810+
// Editor as independent floating window - fully movable
1811+
ImGui::SetNextWindowPos(ImVec2(viewport->Pos.x + 80, viewport->Pos.y + 80), ImGuiCond_FirstUseEver);
1812+
ImGui::SetNextWindowSize(ImVec2(800, 600), ImGuiCond_FirstUseEver);
18221813

1823-
if (ImGui::Begin("Editor", nullptr, editor_flags)) {
1824-
// Register with dockspace for docking
1825-
ImGui::DockBuilderDockWindow("Editor", dockspace_id);
1814+
if (ImGui::Begin("Editor", nullptr, ImGuiWindowFlags_NoCollapse)) {
18261815
render_editor_area();
18271816
ImGui::End();
18281817
}
@@ -2807,7 +2796,7 @@ void EditorApp::render_status_bar() {
28072796
ImGui::SameLine();
28082797

28092798
// Version with git hash
2810-
ImGui::Text("v0.2.30");
2799+
ImGui::Text("v0.2.31");
28112800
}
28122801

28132802
ImGui::PopStyleColor();

0 commit comments

Comments
 (0)