Fix: All UI components inside Editor window. Add layout validation. v0.2.38

Author: djwisdom

CMakeLists.txt

@@ -9,6 +9,9 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# Suppress deprecated function warnings (sprintf, strncpy, getenv, localtime)
+add_compile_definitions(_CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATION)
+
 # ============================================================================
 # Platform Detection
 # ============================================================================
@@ -62,21 +65,15 @@ FetchContent_Declare(
     GIT_REPOSITORY https://github.com/ocornut/imgui.git
     GIT_TAG        docking  # docking branch (stable, includes docking)
 )
-FetchContent_GetProperties(imgui)
-if(NOT imgui_POPULATED)
-    FetchContent_Populate(imgui)
-endif()
+FetchContent_MakeAvailable(imgui)
 
 # ImGuiColorTextEdit — syntax highlighting, line numbers, minimap
 FetchContent_Declare(
     imgui_coloredit
     GIT_REPOSITORY https://github.com/BalazsJako/ImGuiColorTextEdit.git
     GIT_TAG        master
 )
-FetchContent_GetProperties(imgui_coloredit)
-if(NOT imgui_coloredit_POPULATED)
-    FetchContent_Populate(imgui_coloredit)
-endif()
+FetchContent_MakeAvailable(imgui_coloredit)
 
 # Native File Dialog — cross-platform native file picker
 FetchContent_Declare(

VERSION

@@ -1 +1 @@
-0.2.36
+0.2.37

imgui.ini

@@ -1,8 +1,7 @@
 [Window][Editor]
 Pos=0,0
-Size=1009,800
+Size=1280,800
 Collapsed=0
-DockId=0x00000002,0
 
 [Window][DockSpace]
 Size=1280,800
@@ -19,8 +18,8 @@ Size=476,221
 Collapsed=0
 
 [Window][Explorer]
-Pos=1011,0
-Size=269,800
+Pos=236,483
+Size=1280,800
 Collapsed=0
 DockId=0x00000003,0
 
@@ -29,12 +28,17 @@ Size=1280,800
 Collapsed=0
 
 [Window][pcode-editor]
-Pos=0,0
-Size=1159,669
+Size=1280,800
 Collapsed=0
 
 [Docking][Data]
-DockNode    ID=0x00000004 Pos=0,0 Size=1280,800 Split=X
-  DockNode  ID=0x00000002 Parent=0x00000004 SizeRef=849,720 HiddenTabBar=1 Selected=0xDF0EC458
-  DockNode  ID=0x00000003 Parent=0x00000004 SizeRef=226,720 HiddenTabBar=1 Selected=0x00F0E82E
+DockNode        ID=0x00000006 Pos=236,483 Size=1280,800 Split=X
+  DockNode      ID=0x00000001 Parent=0x00000006 SizeRef=225,357 Split=Y
+    DockNode    ID=0x00000004 Parent=0x00000001 SizeRef=1280,583 Split=X
+      DockNode  ID=0x00000002 Parent=0x00000004 SizeRef=872,720 HiddenTabBar=1 Selected=0xDF0EC458
+      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

@@ -7,11 +7,11 @@
   "show_line_numbers": true,
   "show_minimap": true,
   "show_spaces": true,
-  "highlight_line": 2,
+  "highlight_line": 1,
   "show_tabs": true,
   "tab_size": 4,
   "font_size": 17,
   "font_name": "CascadiaMono",
-  "last_open_dir": ".\\src",
-  "recent_files": [".\\src\\editor_app.cpp", ".\\src\\editor_app.h", ".\\src\\main.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"]
+  "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"]
 }

scripts/sync-version.ps1

@@ -1,39 +1,17 @@
 #!/usr/bin/env pwsh
 # ============================================================================
-# Sync version: Reads VERSION file and updates version string in code
+# Sync version: Reads VERSION file - get_version() reads from file directly
+# No code update needed
 # ============================================================================
 
 $VERSION_FILE = "VERSION"
-$CODE_FILE = "src/editor_app.cpp"
-$VERSION_PATTERN = 'return "pCode Editor version \d+\.\d+\.\d+"'
 
-# Read version from VERSION file
 if (!(Test-Path $VERSION_FILE)) {
     Write-Host "❌ VERSION file not found"
     exit 1
 }
 $version = Get-Content $VERSION_FILE -Raw | ForEach-Object { $_.Trim() }
 Write-Host "📌 Version from VERSION file: $version"
-
-# Read current code version
-$codeContent = Get-Content $CODE_FILE -Raw
-if ($codeContent -match $VERSION_PATTERN) {
-    $oldVersion = $Matches[0] -replace 'return "', '' -replace '"', ''
-    Write-Host "📌 Current version in code: $oldVersion"
-    
-    if ($oldVersion -eq $version) {
-        Write-Host "✅ Version already in sync"
-        exit 0
-    }
-    
-    # Update version in code
-    $newPattern = 'return "pCode Editor version ' + $version + '"'
-    $codeContent = $codeContent -replace $VERSION_PATTERN, $newPattern
-    Set-Content -Path $CODE_FILE -Value $codeContent -NoNewline
-    Write-Host "✅ Updated version to $version in $CODE_FILE"
-} else {
-    Write-Host "❌ Could not find version pattern in $CODE_FILE"
-    exit 1
-}
+Write-Host "✅ get_version() reads from VERSION file directly - no sync needed"
 
 exit 0