Upgraded ImGui to 1.91.4

- fixed ImGui examples failing to compile on the docking branch
- added CI test for docking branch

.github/workflows/main.yml

@@ -42,3 +42,15 @@ jobs:
           emcc --shell-file shell.html --use-port=${{github.workspace}}/emscripten-ports/ports/ImGui/imgui.py:backend=glfw:renderer=wgpu main_glfw_wgpu.cpp -o build-glfw-wgpu/index.html
           mkdir build-sdl2-opengl3
           emcc --shell-file shell.html --use-port=${{github.workspace}}/emscripten-ports/ports/ImGui/imgui.py:backend=sdl2:renderer=opengl3 main_sdl2_opengl3.cpp -o build-sdl2-opengl3/index.html
+
+      - name: Compile | ImGui (docking branch)
+        working-directory: ${{github.workspace}}/emscripten-ports/examples/ImGui
+        run: |
+          source ${{github.workspace}}/emscripten/emsdk_env.sh
+          emcc --version
+          mkdir build-glfw-opengl3
+          emcc --shell-file shell.html --use-port=${{github.workspace}}/emscripten-ports/ports/ImGui/imgui.py:backend=glfw:renderer=opengl3:branch=docking main_glfw_opengl3.cpp -o build-glfw-opengl3/index.html
+          mkdir build-glfw-wgpu
+          emcc --shell-file shell.html --use-port=${{github.workspace}}/emscripten-ports/ports/ImGui/imgui.py:backend=glfw:renderer=wgpu:branch=docking main_glfw_wgpu.cpp -o build-glfw-wgpu/index.html
+          mkdir build-sdl2-opengl3
+          emcc --shell-file shell.html --use-port=${{github.workspace}}/emscripten-ports/ports/ImGui/imgui.py:backend=sdl2:renderer=opengl3:branch=docking main_sdl2_opengl3.cpp -o build-sdl2-opengl3/index.html

README.md

@@ -37,7 +37,7 @@ I wrote a blog post about this topic [here](https://www.pongasoft.com/blog/yan/w
   </tr>
   <tr>
     <td><a href="https://github.com/ocornut/imgui">Dear ImGui</a></td>
-    <td>1.91.3</td>
+    <td>1.91.4</td>
     <td><a href="ports/ImGui"><code>imgui.py</code></a></td>
     <td>Bloat-free Graphical User interface for C++ with minimal dependencies</td>
     <td><a href="examples/ImGui">Examples (GLFW + OpenGL3 / GLFW + WebGPU / SDL2 + OpenGL3)</a></td>

examples/ImGui/main_glfw_opengl3.cpp

@@ -115,7 +115,7 @@ int main(int, char **)
     ImGui::NewFrame();
 
 #ifdef IMGUI_ENABLE_DOCKING
-    ImGui::DockSpaceOverViewport(ImGui::GetMainViewport());
+    ImGui::DockSpaceOverViewport(ImGui::GetMainViewport()->ID);
 #endif
 
 #ifndef IMGUI_DISABLE_DEMO

examples/ImGui/main_glfw_wgpu.cpp

@@ -166,7 +166,7 @@ int main(int, char **)
     ImGui::NewFrame();
 
 #ifdef IMGUI_ENABLE_DOCKING
-    ImGui::DockSpaceOverViewport(ImGui::GetMainViewport());
+    ImGui::DockSpaceOverViewport(ImGui::GetMainViewport()->ID);
 #endif
 
 #ifndef IMGUI_DISABLE_DEMO

ports/ImGui/imgui.py

@@ -15,15 +15,15 @@
 import os
 from typing import Union, Dict, Optional
 
-TAG = '1.91.3'
+TAG = '1.91.4'
 
 # Run this file as a script to see which command to run to generate the checksums
 DISTRIBUTIONS = {
     'master': {
-        'hash': '9dadec54791ec155dd60190f38365dbae114787092ce4f66484fbe152a329699de642d659a3a04d5a8af14b3aeb2b23549a3581a970be2c923a630e45b2faf4b'
+        'hash': '3bed4e2f4ac1e1fe078a9783746fb3da3aad936338315b69fbb3871e15af98683d47b43653e483e9c46562b852a646feea10aa9f5af2518d08e7bde1f10c8fa0'
     },
     'docking': {
-        'hash': 'da4c0828e8ef5b8a070e25353a5c09ae375ade15115ab0344b9a68df6a814c6b89e2df5ee3c775b5698aaa87bb97a1f22d7dfa94cfb30cf4bfeed0c9a151b2bc'
+        'hash': '7ad365c944c0c30c8e8ebdee5303c359fd2724354e7d7f5dcccb7a57fc1bd3166ef5a5fdca4618626e6201628783531369997a4b7c1731c9e090b5b2226695a0'
     }
 }