Merge tag 'v1.92.8-docking' into docking

Author: azonenberg

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
       VS_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
       MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           path: ${{ github.workspace }}/imgui
 
@@ -274,7 +274,7 @@ jobs:
         working-directory: ${{ github.workspace }}/imgui
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         path: ${{ github.workspace }}/imgui
 
@@ -343,7 +343,7 @@ jobs:
         EOF
         g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
 
-    - name: Build example_null (with large ImDrawIdx + pointer ImTextureID)
+    - name: Build example_null (with large ImDrawIdx + custom ImTextureID)
       run: |
         cat > example_single_file.cpp <<'EOF'
 
@@ -356,6 +356,21 @@ jobs:
         EOF
         g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
 
+        cat > example_single_file.cpp <<'EOF'
+
+        // Test build ImTextureID defined as a struct
+        struct SomeType { int a = 0; int b = 0; };
+        #define ImTextureID SomeType
+        #define ImTextureID_Invalid SomeType()
+        inline bool operator==(const SomeType& lhs, const SomeType& rhs) { return lhs.a == rhs.a && lhs.b == rhs.b; }
+        inline bool operator!=(const SomeType& lhs, const SomeType& rhs) { return lhs.a != rhs.a || lhs.b != rhs.b; }
+        #define IMGUI_IMPLEMENTATION
+        #include "misc/single_file/imgui_single_file.h"
+        #include "examples/example_null/main.cpp"
+
+        EOF
+        g++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
+
     - name: Build example_null (with IMGUI_DISABLE_OBSOLETE_FUNCTIONS)
       run: |
         cat > example_single_file.cpp <<'EOF'
@@ -499,7 +514,7 @@ jobs:
         working-directory: ${{ github.workspace }}/imgui
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         path: ${{ github.workspace }}/imgui
 
@@ -510,7 +525,7 @@ jobs:
     - name: Build example_null (extra warnings, clang 64-bit)
       run: make -C examples/example_null WITH_EXTRA_WARNINGS=1
 
-    - name: Build example_null (single file build)
+    - name: Build macOS example_null (single file build)
       run: |
         cat > example_single_file.cpp <<'EOF'
 
@@ -521,7 +536,7 @@ jobs:
         EOF
         clang++ -I. -std=c++11 -Wall -Wformat -o example_single_file example_single_file.cpp
 
-    - name: Build example_null (single file build, c++20)
+    - name: Build macOS example_null (single file build, c++20)
       run: |
         cat > example_single_file.cpp <<'EOF'
 
@@ -532,7 +547,7 @@ jobs:
         EOF
         clang++ -I. -std=c++20 -Wall -Wformat -o example_single_file example_single_file.cpp
 
-    - name: Build example_null (without c++ runtime)
+    - name: Build macOS example_null (without c++ runtime)
       run: |
         cat > example_single_file.cpp <<'EOF'
 
@@ -543,41 +558,45 @@ jobs:
         EOF
         clang++ -I. -std=c++11 -Wall -Wformat -nodefaultlibs -fno-rtti -fno-exceptions -fno-threadsafe-statics -lc -lm -o example_single_file example_single_file.cpp
 
-    - name: Build example_glfw_opengl2
+    - name: Build macOS example_glfw_opengl2
       run: make -C examples/example_glfw_opengl2
+      if: github.event_name == 'workflow_run'
 
-    - name: Build example_glfw_opengl3
+    - name: Build macOS example_glfw_opengl3
       run: make -C examples/example_glfw_opengl3
       if: github.event_name == 'workflow_run'
 
-    - name: Build example_glfw_metal
+    - name: Build macOS example_glfw_metal
       run: make -C examples/example_glfw_metal
 
-    - name: Build example_sdl2_metal
+    - name: Build macOS example_sdl2_metal
       run: make -C examples/example_sdl2_metal
 
-    - name: Build example_sdl2_opengl2
+    - name: Build macOS example_sdl2_opengl2
       run: make -C examples/example_sdl2_opengl2
       if: github.event_name == 'workflow_run'
 
-    - name: Build example_sdl2_opengl3
+    - name: Build macOS example_sdl2_opengl3
       run: make -C examples/example_sdl2_opengl3
+      if: github.event_name == 'workflow_run'
 
-    - name: Build example_sdl3_opengl3
+    - name: Build macOS example_sdl3_opengl3
       run: make -C examples/example_sdl3_opengl3
 
-    - name: Build example_apple_metal
+    - name: Build macOS example_apple_metal
       run: xcodebuild -project examples/example_apple_metal/example_apple_metal.xcodeproj -target example_apple_metal_macos
+      if: github.event_name == 'workflow_run'
 
-    - name: Build example_apple_opengl2
+    - name: Build macOS example_apple_opengl2
       run: xcodebuild -project examples/example_apple_opengl2/example_apple_opengl2.xcodeproj -target example_osx_opengl2
+      if: github.event_name == 'workflow_run'
 
   Build-iOS:
     runs-on: macos-14
     name: Build - iOS
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Build example_apple_metal
       run: |
@@ -589,7 +608,7 @@ jobs:
     name: Build - Emscripten
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Install Dependencies
       run: |
@@ -632,7 +651,7 @@ jobs:
     name: Build - Android
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Build example_android_opengl3
       run: |
@@ -651,11 +670,11 @@ jobs:
       MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           path: ${{ github.workspace }}/imgui
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         continue-on-error: true
         with:
           fetch-depth: 1
@@ -706,11 +725,11 @@ jobs:
         working-directory: ${{ github.workspace }}/imgui
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         path: ${{ github.workspace }}/imgui
 
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 1
         repository: ocornut/imgui_test_engine
@@ -735,40 +754,40 @@ jobs:
       working-directory: ${{ github.workspace }}/imgui_test_engine/imgui_test_suite
       run: ./imgui_test_suite -nogui -nopause -v2 -ve4 -viewport-mock viewport
 
-  Test-MacOS:
-    runs-on: macos-latest
-    name: Test - MacOS
-
-    defaults:
-      run:
-        working-directory: ${{ github.workspace }}/imgui
-
-    steps:
-    - uses: actions/checkout@v5
-      with:
-        path: ${{ github.workspace }}/imgui
-
-    - uses: actions/checkout@v5
-      with:
-        fetch-depth: 1
-        repository: ocornut/imgui_test_engine
-        path: ${{ github.workspace }}/imgui_test_engine
-        submodules: true
-
-    - name: Build Tests
-      working-directory: ${{ github.workspace }}/imgui_test_engine/imgui_test_suite
-      run: make -j$(nproc)
-
-    - name: Run Tests
-      working-directory: ${{ github.workspace }}/imgui_test_engine/imgui_test_suite
-      run: ./imgui_test_suite -nogui -nopause -v2 -ve4 tests
-
-    - name: Check for Docking
-      id: check_docking
-      working-directory: ${{ github.workspace }}/imgui
-      run: echo "has_dock=$(grep -q "#define IMGUI_HAS_DOCK" imgui.h && echo true || echo false)" >> $GITHUB_OUTPUT
-
-    - name: Run Viewport Tests
-      if: steps.check_docking.outputs.has_dock == 'true'
-      working-directory: ${{ github.workspace }}/imgui_test_engine/imgui_test_suite
-      run: ./imgui_test_suite -nogui -nopause -v2 -ve4 -viewport-mock viewport
+#  Test-MacOS:
+#    runs-on: macos-latest
+#    name: Test - MacOS
+#
+#    defaults:
+#      run:
+#        working-directory: ${{ github.workspace }}/imgui
+#
+#    steps:
+#    - uses: actions/checkout@v6
+#      with:
+#        path: ${{ github.workspace }}/imgui
+#
+#    - uses: actions/checkout@v6
+#      with:
+#        fetch-depth: 1
+#        repository: ocornut/imgui_test_engine
+#        path: ${{ github.workspace }}/imgui_test_engine
+#        submodules: true
+#
+#    - name: Build Tests
+#      working-directory: ${{ github.workspace }}/imgui_test_engine/imgui_test_suite
+#      run: make -j$(nproc)
+#
+#    - name: Run Tests
+#      working-directory: ${{ github.workspace }}/imgui_test_engine/imgui_test_suite
+#      run: ./imgui_test_suite -nogui -nopause -v2 -ve4 tests
+#
+#    - name: Check for Docking
+#      id: check_docking
+#      working-directory: ${{ github.workspace }}/imgui
+#      run: echo "has_dock=$(grep -q "#define IMGUI_HAS_DOCK" imgui.h && echo true || echo false)" >> $GITHUB_OUTPUT
+#
+#    - name: Run Viewport Tests
+#      if: steps.check_docking.outputs.has_dock == 'true'
+#      working-directory: ${{ github.workspace }}/imgui_test_engine/imgui_test_suite
+#      run: ./imgui_test_suite -nogui -nopause -v2 -ve4 -viewport-mock viewport

.github/workflows/static-analysis.yml

@@ -12,7 +12,7 @@ jobs:
   PVS-Studio:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 1
 

.gitignore

@@ -1,5 +1,7 @@
-## OSX artifacts
+## Misc artifacts
 .DS_Store
+.claude
+.vscode
 
 ## Dear ImGui artifacts
 imgui.ini
@@ -55,9 +57,6 @@ examples/example_sdl3_wgpu/web/*
 .idea
 cmake-build-*
 
-## VS code artifacts
-.vscode
-
 ## Unix executables from our example Makefiles
 examples/example_apple_metal/example_apple_metal
 examples/example_apple_opengl2/example_apple_opengl2

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2025 Omar Cornut
+Copyright (c) 2014-2026 Omar Cornut
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

backends/imgui_impl_allegro5.cpp

@@ -9,6 +9,7 @@
 //  [X] Platform: Mouse cursor shape and visibility (ImGuiBackendFlags_HasMouseCursors). Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'.
 // Missing features or Issues:
 //  [ ] Renderer: The renderer is suboptimal as we need to unindex our buffers and convert vertices manually.
+//  [ ] Renderer: Missing support for DrawCallback_SetSamplerLinear, DrawCallback_SetSamplerNearest callbacks: Allegro5 cannot enable/disable LINEAR bitmap flags after creation.
 //  [ ] Platform: Missing gamepad support.
 //  [ ] Renderer: Multi-viewport support (multiple windows).
 
@@ -22,6 +23,7 @@
 
 // CHANGELOG
 // (minor and older changes stripped away, please see git history for details)
+//  2026-04-23: Added support for standard draw callbacks (in platform_io): DrawCallback_ResetRenderState (others cannot be supported by Allegro5). (#9378)
 //  2025-09-18: Call platform_io.ClearRendererHandlers() and platform_io.ClearPlatformHandlers() on shutdown.
 //  2025-08-12: Inputs: fixed missing support for ImGuiKey_PrintScreen under Windows, as raw Allegro 5 does not receive it.
 //  2025-08-12: Added ImGui_ImplAllegro5_SetDisplay() function to change current ALLEGRO_DISPLAY, as Allegro applications often need to do that.
@@ -137,7 +139,10 @@ static void ImGui_ImplAllegro5_SetupRenderState(ImDrawData* draw_data)
     }
 }
 
-// Render function.
+// Draw callbacks
+static void ImGui_ImplAllegro5_DrawCallback_ResetRenderState(const ImDrawList*, const ImDrawCmd*) {} // Intentionally empty. Used as an identifier for rendering loop to call its code. Simpler to implement this way.
+
+// Render function
 void ImGui_ImplAllegro5_RenderDrawData(ImDrawData* draw_data)
 {
     // Avoid rendering when minimized
@@ -153,6 +158,7 @@ void ImGui_ImplAllegro5_RenderDrawData(ImDrawData* draw_data)
 
     // Backup Allegro state that will be modified
     ImGui_ImplAllegro5_Data* bd = ImGui_ImplAllegro5_GetBackendData();
+    ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
     ALLEGRO_TRANSFORM last_transform = *al_get_current_transform();
     ALLEGRO_TRANSFORM last_projection_transform = *al_get_current_projection_transform();
     int last_clip_x, last_clip_y, last_clip_w, last_clip_h;
@@ -209,8 +215,7 @@ void ImGui_ImplAllegro5_RenderDrawData(ImDrawData* draw_data)
             if (pcmd->UserCallback)
             {
                 // User callback, registered via ImDrawList::AddCallback()
-                // (ImDrawCallback_ResetRenderState is a special callback value used by the user to request the renderer to reset render state.)
-                if (pcmd->UserCallback == ImDrawCallback_ResetRenderState)
+                if (pcmd->UserCallback == ImGui_ImplAllegro5_DrawCallback_ResetRenderState)
                     ImGui_ImplAllegro5_SetupRenderState(draw_data);
                 else
                     pcmd->UserCallback(draw_list, pcmd);
@@ -487,11 +492,12 @@ bool ImGui_ImplAllegro5_Init(ALLEGRO_DISPLAY* display)
 
     ImGui_ImplAllegro5_SetDisplay(display);
 
-#if ALLEGRO_HAS_CLIPBOARD
     ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
+#if ALLEGRO_HAS_CLIPBOARD
     platform_io.Platform_SetClipboardTextFn = ImGui_ImplAllegro5_SetClipboardText;
     platform_io.Platform_GetClipboardTextFn = ImGui_ImplAllegro5_GetClipboardText;
 #endif
+    platform_io.DrawCallback_ResetRenderState = ImGui_ImplAllegro5_DrawCallback_ResetRenderState;
 
     return true;
 }
@@ -525,7 +531,7 @@ void ImGui_ImplAllegro5_SetDisplay(ALLEGRO_DISPLAY* display)
     if (bd->VertexDecl)
     {
         al_destroy_vertex_decl(bd->VertexDecl);
-        bd->VertexDecl = NULL;
+        bd->VertexDecl = nullptr;
     }
 
     if (bd->Display && !bd->VertexDecl)

backends/imgui_impl_allegro5.h

@@ -9,6 +9,7 @@
 //  [X] Platform: Mouse cursor shape and visibility (ImGuiBackendFlags_HasMouseCursors). Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'.
 // Missing features or Issues:
 //  [ ] Renderer: The renderer is suboptimal as we need to unindex our buffers and convert vertices manually.
+//  [ ] Renderer: Missing support for DrawCallback_SetSamplerLinear, DrawCallback_SetSamplerNearest callbacks: Allegro5 cannot enable/disable LINEAR bitmap flags after creation.
 //  [ ] Platform: Missing gamepad support.
 //  [ ] Renderer: Multi-viewport support (multiple windows).
 
@@ -39,7 +40,7 @@ IMGUI_IMPL_API void     ImGui_ImplAllegro5_SetDisplay(ALLEGRO_DISPLAY* display);
 IMGUI_IMPL_API bool     ImGui_ImplAllegro5_CreateDeviceObjects();
 IMGUI_IMPL_API void     ImGui_ImplAllegro5_InvalidateDeviceObjects();
 
-// (Advanced) Use e.g. if you need to precisely control the timing of texture updates (e.g. for staged rendering), by setting ImDrawData::Textures = NULL to handle this manually.
+// (Advanced) Use e.g. if you need to precisely control the timing of texture updates (e.g. for staged rendering), by setting ImDrawData::Textures = nullptr to handle this manually.
 IMGUI_IMPL_API void     ImGui_ImplAllegro5_UpdateTexture(ImTextureData* tex);
 
 #endif // #ifndef IMGUI_DISABLE