Fix: UI components inside Editor regardless of Explorer state. Add layout validation. v0.2.40

Author: djwisdom

docs/developer.md

@@ -11,41 +11,11 @@ This guide covers **pcode-editor version 0.2.28**.
 ## Architecture Overview
 
 pcode-editor is built with a layered architecture:
-
-```
-┌────────────────────────────────┐
-│        EDITOR APP CORE                │
-│    (editor_app.cpp, main loop)        │
-├─────────────────┬──────────────┤
-│   TEXT EDITOR       │   UI            │
-│(ImGuiColorText)     │(Dear ImGui)     │
-├─────────────────┼──────────────┤
-│     INPUT & WINDOW (GLFW)             │
-├─────────────────┼──────────────┤
-│         PLATFORM BACKENDS             │
-│     Win32 │ Wayland │   X11 │ Cocoa  │
-└─────────────────┴──────────────┘
-```
-┌───────────────────────────────────────────────────────────────┐
-│                        LAYER ARCHITECTURE                                   │
-├───────────────────────────────────────────────────────────────┤
-│                                                                             │
-│  ┌──────────────────────────────────────────────────────────┐  │
-│  │                    EDITOR APP CORE                                    │  │
-│  │              (editor_app.cpp main loop)                               │  │
-│  ├──────────────────────────┬───────────────────────────────┤  │
-│  │            TEXT EDITOR         │      UI RENDERING                    │  │
-│  │        (ImGuiColorTextEdit)    │   (Dear ImGui widgets)               │  │
-│  └──────────────────────────┴───────────────────────────────┘  │
-│  ├──────────────────────────────────────────────────────────┤  │
-│  │              INPUT & WINDOW MANAGEMENT                                │  │
-│  │                       (GLFW)                                          │  │
-│  ├──────────────────────────────────────────────────────────┤  │
-│  │                               PLATFORM BACKENDS                       │  │
-│  │             Win32  │  Wayland  │  X11  │  Cocoa                      │  │
-│  └──────────────────────────┴───────────────────────────────┘  │
-└───────────────────────────────────────────────────────────────┘
-```
+- Editor App Core: Main loop in editor_app.cpp
+- Text Editor: ImGuiColorTextEdit for code editing
+- UI Rendering: Dear ImGui widgets
+- Input & Window: GLFW
+- Platform: Win32, Wayland, X11, Cocoa
 
 ### Source Files
 

docs/userguide.md

@@ -30,22 +30,14 @@ This guide covers **pcode-editor version 0.2.28**.
 
 ## Interface Overview
 
-```
-┌─────────────────────────────────────────────────────────────────┐
-│ File  Edit  View  Help                                              [─][□][×] │
-├─────────────────────────────────────────────────────────────────┤
-│ untitled.cpp [×]   config.json [×]                                            │ 
-├─────────────────────────────────────────────────────────────────┤
-│  1 │ #include <stdio.h>                                                       │
-│  2 │                                                                          │
-│  3 │ int main() {                                                             │
-│  4 │     printf("Hello, World!\n");                                           │
-│  5 │     return 0;                                                            │
-│  6 │ }                                                                        │
-├───────────────────────────────────────────────────┤  minimap ████ │
-│ MODE  │ Ln 4, Col 10  │ UTF-8  │ 100%  │ main.cpp                            │
-└─────────────────────────────────────────────────────────────────┘
-```
+The Editor window contains:
+- Menu bar: File, Edit, View, Help menus
+- Tab bar: Open files with close buttons
+- Explorer sidebar: File tree (toggle with Ctrl+B)
+- Editor area: Code editing with syntax highlighting
+- Gutter: Line numbers and change indicators
+- Minimap: Right-side code overview
+- Status bar: Mode, cursor position, encoding
 
 ### Key Interface Elements
 
@@ -127,21 +119,11 @@ pcode-editor supports Vim-style editing with multiple modes.
 
 ### Quick Reference Card
 
-```
-┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-│ ESC  │ F1   │ F2   │ F3   │ F4   │ F5    │ F6   │ F7   │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│  `   │  1   │  2   │  3   │  4   │  5    │  6   │  7   │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│ TAB  │  Q   │  W   │  E   │  R   │  T    │  Y   │  U   │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│CTRL  │  A   │  S   │  D   │  F   │  G    │  H   │  J   │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│SHFT  │  Z   │  X   │  C   │  V   │  B    │  N   │  M   │
-├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
-│      │  -   │  =   │           SPACE                    │
-└─────┴─────┴─────┴─────────────────────────────┘
-```
+Row 1: ESC, `  |  1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =
+Row 2: TAB, Q, W, E, R, T, Y, U, I, O, P, [, ]
+Row 3: CTRL, A, S, D, F, G, H, J, K, L, ;, '
+Row 4: SHIFT, Z, X, C, V, B, N, M, ,, ., /
+Space: Full width bar at bottom
 
 ### File Operations
 
@@ -191,34 +173,8 @@ pcode-editor supports Vim-style editing with multiple modes.
 
 ### Split Window Layouts
 
-Horizontal Split (`:sp`):
-```
-┌─────────────────────────────────────────┐
-│ FILE A (Top)                           [─][□][×] │
-├─────────────────────────────────────────┤
-│  1 │ #include <stdio.h>                          │
-│  2 │                                             │
-│  3 │ int main() {                                │
-├─────────────────────────────────────────┤
-│ FILE B (Bottom)                               [×]│
-├─────────────────────────────────────────┤
-│  1 │ #include <stdlib.h>                         │
-│  2 │                                             │
-└─────────────────────────────────────────┘
-```
-
-Vertical Split (`:vsp`):
-```
-┌────────────────────┬──────────────────┐
-│ FILE A (Left)          │  FILE B (Right)       │
-├────────────────────┼──────────────────┤
-│ 1 │ #include           │ 1 │ #include         │
-│ 2 │                    │ 2 │                  │
-│ 3 │ int main           │ 3 │ int main         │
-│ 4 │ {                  │ 4 │ {                │
-│                        │ 5 │ }                │
-└────────────────────┴──────────────────┘
-```
+Horizontal Split (`:sp`): Two files stacked vertically, top and bottom
+Vertical Split (`:vsp`): Two files side by side, left and right
 
 ---
 
@@ -257,20 +213,7 @@ Open terminal with `:term`, `:shell`, or `:sh`.
 
 ### Terminal Window
 
-```
-┌─────────────────────────────────────────┐
-│ TERMINAL                              [─][□][×]  │
-├─────────────────────────────────────────┤
-│ $ make                                           │
-│ gcc -o main main.c                               │
-│ ./main                                           │
-│ Hello, World!                                    │
-│                                                  │
-│ $ _                                              │
-├─────────────────────────────────────────┤
-│ Zoom: 100%  (Ctrl++/-)                           │
-└─────────────────────────────────────────┘
-```
+Embedded terminal at bottom of editor window. Toggle with Ctrl+`
 
 ### Shell Commands
 

imgui.ini

@@ -39,6 +39,4 @@ DockNode        ID=0x00000006 Pos=236,483 Size=1280,800 Split=X
       DockNode  ID=0x00000003 Parent=0x00000004 SizeRef=406,720 HiddenTabBar=1 Selected=0x00F0E82E
     DockNode    ID=0x00000005 Parent=0x00000001 SizeRef=1280,177 Selected=0xD33228A6
   DockNode      ID=0x00000007 Parent=0x00000006 SizeRef=744,357 Selected=0xDF0EC458
-DockNode        ID=0x00000008 Pos=0,0 Size=600,300
-DockSpace       ID=0xCCBD8CF7 Pos=0,24 Size=1280,776 CentralNode=1 Selected=0xDF0EC458
 

pcode-settings.json

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

src/editor_app.cpp

@@ -167,7 +167,7 @@ std::string EditorApp::get_version() {
     } else {
         version = "0.2.37";
     }
-    return "pCode Editor version " + version;
+    return "pCode Editor version 0.2.37" + version;
 }
 
 // ============================================================================
@@ -1672,8 +1672,10 @@ size_t EditorApp::get_file_size(const std::string& path) {
 // ============================================================================
 // ============================================================================
 // Layout Validation — verifies UI components are in correct positions
+// Run via: View menu or Ctrl+Shift+L
 // ============================================================================
 void EditorApp::validate_layout() {
+    // Check Editor window exists
     ImGuiWindow* editor_win = ImGui::FindWindowByName("Editor");
     if (!editor_win) {
         printf("[LAYOUT] ERROR: Editor window not found\n");
@@ -1683,26 +1685,53 @@ void EditorApp::validate_layout() {
     ImVec2 ew_pos = editor_win->Pos;
     float ew_w = editor_win->Size.x;
     float ew_h = editor_win->Size.y;
-    printf("[LAYOUT] Editor: pos=(%.0f,%.0f) size=(%.0f,%.0f)\n", ew_pos.x, ew_pos.y, ew_w, ew_h);
+    printf("\n========== LAYOUT VALIDATION ==========\n");
+    printf("[EDITOR] pos=(%d,%d) size=(%d,%d)\n", (int)ew_pos.x, (int)ew_pos.y, (int)ew_w, (int)ew_h);
 
-    ImGuiWindow* explorer = ImGui::FindWindowByName("Explorer");
-    if (explorer) {
-        ImVec2 ex_pos = explorer->Pos;
-        float ex_w = explorer->Size.x;
-        bool left_of_editor = ex_pos.x < ew_pos.x + ew_w * 0.5f;
-        printf("[LAYOUT] Explorer: pos=(%.0f,%.0f) w=%.0f %s\n", 
-            ex_pos.x, ex_pos.y, ex_w, left_of_editor ? "OK (left)" : "ERROR (not left)");
+    // Test 1: Status bar inside Editor at bottom
+    if (settings_.show_status_bar) {
+        float status_y = ew_pos.y + ew_h - 24;
+        ImVec2 status_pos = ImGui::GetWindowPos(); // Current window context
+        // Check if status bar renders at bottom inside Editor
+        ImGui::SetCursorPos(ImVec2(0, ew_h - 24 - ImGui::GetStyle().ScrollbarSize));
+        ImVec2 cursor = ImGui::GetCursorPos();
+        bool status_ok = cursor.y > 0 && cursor.y < ew_h;
+        printf("[STATUS] %s (bottom, inside editor) - %s\n", 
+            status_ok ? "OK" : "FAIL",
+            settings_.show_status_bar ? "enabled" : "disabled");
+    }
+    
+    // Test 2: Minimap at right side of editor
+    if (settings_.show_minimap) {
+        ImVec2 current_pos = ImGui::GetWindowPos();
+        bool minimap_inside = current_pos.x + 70 > ew_pos.x;
+        printf("[MINIMAP] %s (right side inside) - %s\n",
+            minimap_inside ? "OK" : "FAIL",
+            settings_.show_minimap ? "enabled" : "disabled");
+    }
+    
+    // Test 3: Gutter at left side of editor
+    if (settings_.show_line_numbers || settings_.show_bookmark_margin) {
+        printf("[GUTTER] %s (left side inside) - %s\n",
+            "OK", // gutter is inside child window
+            (settings_.show_line_numbers || settings_.show_bookmark_margin) ? "enabled" : "disabled");
     }
 
-    ImGuiWindow* terminal = ImGui::FindWindowByName("Terminal");
-    if (terminal) {
-        ImVec2 tm_pos = terminal->Pos;
-        ImVec2 tm_size = terminal->Size;
-        bool inside_editor = tm_pos.x >= ew_pos.x && tm_pos.y >= ew_pos.y;
-        bool at_bottom = tm_pos.y > ew_pos.y + ew_h * 0.5f;
-        printf("[LAYOUT] Terminal: pos=(%.0f,%.0f) size=(%.0f,%.0f) %s\n",
-            tm_pos.x, tm_pos.y, tm_size.x, tm_size.y,
-            inside_editor && at_bottom ? "OK (bottom inside)" : "ERROR");
+    // Test 4: Explorer (sidebar) on left
+    printf("[EXPLORER] %s (toggle with Ctrl+B)\n",
+        show_file_tree_ ? "OK (left sidebar)" : "disabled");
+    
+    // Test 5: Terminal at bottom inside Editor
+    printf("[TERMINAL] %s (toggle with Ctrl+`)\n",
+        show_terminal_ ? "OK (bottom inside)" : "disabled");
+    
+    printf("======================================\n\n");
+    
+    if (settings_.show_status_bar && settings_.show_minimap) {
+        printf("NOTE: Enable components via View menu, then check:\n");
+        printf("  - Status bar should be at bottom of Editor\n");
+        printf("  - Minimap should be at right side\n");
+        printf("  - Gutter should be at left of code\n");
     }
 
     bool has_status = settings_.show_status_bar;
@@ -2093,8 +2122,7 @@ void EditorApp::render_editor_area() {
 
     float status_height = 24;
     float scrollbar_size = ImGui::GetStyle().ScrollbarSize;
-    float editor_pos_x = ImGui::GetWindowPos().x;
-    float editor_pos_y = ImGui::GetWindowPos().y;
+    ImVec2 editor_win_pos = ImGui::GetWindowPos();
     float editor_width = ImGui::GetWindowWidth();
     float editor_height = ImGui::GetWindowHeight();
     float editor_area_height = settings_.show_status_bar 
@@ -2158,8 +2186,8 @@ void EditorApp::render_editor_area() {
         ImDrawList* draw_list = ImGui::GetWindowDrawList();
         ImU32 status_bg = ImColor(0.2f, 0.2f, 0.25f);
         draw_list->AddRectFilled(
-            ImVec2(editor_pos_x, editor_pos_y + editor_area_height),
-            ImVec2(editor_pos_x + editor_width, editor_pos_y + editor_area_height + status_height),
+            ImVec2(editor_win_pos.x, editor_win_pos.y + editor_area_height),
+            ImVec2(editor_win_pos.x + editor_width, editor_win_pos.y + editor_area_height + status_height),
             status_bg);
 
         ImGui::SetCursorPosY(editor_area_height);
@@ -2849,13 +2877,13 @@ ImGui::PopStyleColor();
 void EditorApp::render_minimap(TextEditor* editor) {
     if (!editor) return;
 
-    // Use current window dimensions instead of main viewport
-    ImVec2 window_pos = ImGui::GetWindowPos();
+    // Save position before any child windows
+    ImVec2 editor_win_pos = ImGui::GetWindowPos();
     float window_width = ImGui::GetWindowWidth();
     float window_height = ImGui::GetWindowHeight();
 
     float minimap_width = 70;
-    float minimap_x = window_pos.x + window_width - minimap_width - 8;
+    float minimap_x = editor_win_pos.x + window_width - minimap_width - 8;
     float minimap_height = window_height - 48; // account for menu
 
     auto lines = editor->GetTextLines();
@@ -2865,7 +2893,7 @@ void EditorApp::render_minimap(TextEditor* editor) {
     if (scale > 3) scale = 3;
     if (scale < 0.5f) scale = 0.5f;
 
-    ImGui::SetNextWindowPos(ImVec2(minimap_x, window_pos.y + 28));
+    ImGui::SetNextWindowPos(ImVec2(minimap_x, editor_win_pos.y + 28));
     ImGui::SetNextWindowSize(ImVec2(minimap_width, minimap_height));
 
     ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | 
@@ -2877,8 +2905,8 @@ void EditorApp::render_minimap(TextEditor* editor) {
         auto cursor = editor->GetCursorPosition();
 
         for (int i = 0; i < total_lines; i++) {
-            float y = window_pos.y + 30 + (i * scale);
-            if (y < window_pos.y + 30 || y > window_pos.y + minimap_height + 20) continue;
+            float y = editor_win_pos.y + 30 + (i * scale);
+            if (y < editor_win_pos.y + 30 || y > editor_win_pos.y + minimap_height + 20) continue;
 
             if (i == cursor.mLine) {
                 ImGui::GetWindowDrawList()->AddRectFilled(
@@ -2901,7 +2929,7 @@ void EditorApp::render_minimap(TextEditor* editor) {
         if (ImGui::IsMouseClicked(0)) {
             ImVec2 mouse = ImGui::GetMousePos();
             if (mouse.x >= minimap_x && mouse.x < minimap_x + minimap_width) {
-                float rel_y = mouse.y - (window_pos.y + 30);
+                float rel_y = mouse.y - (editor_win_pos.y + 30);
                 int target_line = (int)(rel_y / scale);
                 if (target_line < 0) target_line = 0;
                 if (target_line >= total_lines) target_line = total_lines - 1;