zzre: Upgrade ImGui to 1.90.1

Directory.Build.props

@@ -13,13 +13,13 @@
         <RestoreSources>$(RestoreSources);../nuget-feed;https://api.nuget.org/v3/index.json</RestoreSources>
         <VeldridHash>g603c7f2521</VeldridHash>
         <DefaultEcsHash>0e92bb5</DefaultEcsHash>
-        <ImguiHash>beeb8dd</ImguiHash>
+        <ImguiHash>9b51cce</ImguiHash>
         <MlangHash>331cf83</MlangHash>
         <VeldridVersion>4.9.0-$(VeldridHash)</VeldridVersion>
         <VeldridRenderdocVersion>1.0.1-$(VeldridHash)</VeldridRenderdocVersion>
         <DefaultEcsVersion>1.0.0-$(DefaultEcsHash)</DefaultEcsVersion>
         <DefaultEcsSafeVersion>1.0.0-safe-$(DefaultEcsHash)</DefaultEcsSafeVersion>
-        <ImguiVersion>1.88.0-$(ImguiHash)</ImguiVersion>
+        <ImguiVersion>1.90.1.1-$(ImguiHash)</ImguiVersion>
         <ImguizmoVersion>1.61.0-$(ImguiHash)</ImguizmoVersion>
         <MlangVersion>1.0.0-$(MlangHash)</MlangVersion>
     </PropertyGroup>

get-dependencies.sh

@@ -6,9 +6,9 @@ if [[ "$1" != "no-submodule-update" ]]; then
 fi
 
 if [[ "$OSTYPE" == "msys" ]]; then
-    powershell -executionpolicy bypass -File "extern/ImGui.NET/download-native-deps.ps1" -tag 1.88 -repository "https://github.com/Helco/ImGui.NET-nativebuild"
+    powershell -executionpolicy bypass -File "extern/ImGui.NET/download-native-deps.ps1" -tag 1.90.1 -repository "https://github.com/Helco/ImGui.NET-nativebuild"
 else
-    bash extern/ImGui.NET/download-native-deps.sh 1.88
+    bash extern/ImGui.NET/download-native-deps.sh 1.90.1
 fi
 
 DefaultEcsHash=`git -C extern/DefaultEcs rev-parse --short HEAD`

zzre.core/imgui/ImGuiRenderer.cs

@@ -365,6 +365,7 @@ public void BeginEventUpdate(float deltaSeconds)
             }
 
             SetPerFrameImGuiData(deltaSeconds);
+            ImGui.GetIO().MouseWheel = 0f;
         }
 
         public void UseWith(SdlWindow window)
@@ -380,6 +381,7 @@ private unsafe bool HandleEvent(SdlWindow window, Event ev)
             {
                 case EventType.Mousemotion when ev.Motion.WindowID == window.WindowID:
                     io.AddMousePosEvent(ev.Motion.X, ev.Motion.Y);
+                    io.MousePos = new(ev.Motion.X, ev.Motion.Y);
                     return true;
 
                 case EventType.Mousebuttondown or EventType.Mousebuttonup when ev.Motion.WindowID == window.WindowID:
@@ -391,11 +393,15 @@ private unsafe bool HandleEvent(SdlWindow window, Event ev)
                         _ => ImGuiMouseButton.COUNT
                     };
                     if (button != ImGuiMouseButton.COUNT)
-                        io.AddMouseButtonEvent((int)button, ev.Type == (uint)EventType.Mousebuttondown);
+                    {
+                        var isDown = ev.Type == (uint)EventType.Mousebuttondown;
+                        io.AddMouseButtonEvent((int)button, isDown);
+                    }
                     return button != ImGuiMouseButton.COUNT;
 
                 case EventType.Mousewheel when ev.Wheel.WindowID == window.WindowID:
                     io.AddMouseWheelEvent(ev.Wheel.PreciseX, ev.Wheel.PreciseY);
+                    io.MouseWheel = ev.Wheel.PreciseY;
                     return true;
 
                 case EventType.Keydown or EventType.Keyup when ev.Key.WindowID == window.WindowID:
@@ -637,7 +643,7 @@ private unsafe void RenderImDrawData(ImDrawDataPtr draw_data, GraphicsDevice gd,
 
             for (int i = 0; i < draw_data.CmdListsCount; i++)
             {
-                ImDrawListPtr cmd_list = ((ImDrawList**)draw_data.CmdLists)[i];
+                ImDrawListPtr cmd_list = draw_data.CmdLists[i];
 
                 cl.UpdateBuffer(
                     _vertexBuffer,
@@ -682,7 +688,7 @@ private unsafe void RenderImDrawData(ImDrawDataPtr draw_data, GraphicsDevice gd,
             int idx_offset = 0;
             for (int n = 0; n < draw_data.CmdListsCount; n++)
             {
-                ImDrawListPtr cmd_list = ((ImDrawList**)draw_data.CmdLists)[n];
+                ImDrawListPtr cmd_list = draw_data.CmdLists[n];
                 for (int cmd_i = 0; cmd_i < cmd_list.CmdBuffer.Size; cmd_i++)
                 {
                     ImDrawCmdPtr pcmd = cmd_list.CmdBuffer[cmd_i];

zzre.core/imgui/MouseEventArea.cs

@@ -12,9 +12,11 @@ public class MouseEventArea
     private Vector2? lastPosition;
     private readonly Vector2[] lastDragDelta = new Vector2[(int)ImGuiMouseButton.COUNT];
     private readonly bool[] triggerClickEvent = new bool[(int)ImGuiMouseButton.COUNT];
+    private readonly Vector2[] mouseLastDownPos = new Vector2[(int)ImGuiMouseButton.COUNT];
+    private readonly bool[] mouseLastDownState = new bool[(int)ImGuiMouseButton.COUNT];
     private Rect validBounds = Rect.Zero;
 
-    public Vector2 MousePosition => GetIO().MousePos - validBounds.Min;
+    public Vector2 MousePosition => GetMousePos() - validBounds.Min;
 
     public event Action<MouseButton, Vector2>? OnDrag;
     public event Action<float>? OnScroll;
@@ -28,7 +30,7 @@ public MouseEventArea(Window parent)
         parent.AddTag(this);
     }
 
-    public void Content()
+    public unsafe void Content()
     {
         if (!window.IsOpen || !window.IsFocused)
             return;
@@ -53,18 +55,24 @@ public void Content()
         else
             lastPosition = null;
 
-        // Drag event
+        // Drag and button events
         for (int i = 0; i < (int)ImGuiMouseButton.COUNT; i++)
         {
             var button = (ImGuiMouseButton)i;
-            if (!validBounds.IsInside(GetIO().MouseClickedPos[i]))
+
+            var isDown = IsMouseDown(button);
+            if (isDown && !mouseLastDownState[i])
+                mouseLastDownPos[i] = GetIO().MousePos;
+            mouseLastDownState[i] = isDown;
+
+            if (!validBounds.IsInside(mouseLastDownPos[i]))
                 continue;
 
             if (triggerClickEvent[i] != IsMouseDown(button))
             {
                 ((triggerClickEvent[i] = IsMouseDown(button))
                     ? OnButtonDown
-                    : OnButtonUp)?.Invoke(ToSDL(button), validBounds.RelativePos(GetIO().MouseClickedPos[i]));
+                    : OnButtonUp)?.Invoke(ToSDL(button), validBounds.RelativePos(mouseLastDownPos[i]));
             }
 
             if (!IsMouseDragging(button))

zzre/imgui/OpenFileModal.cs

@@ -72,7 +72,7 @@ private void HandleContent()
         PopItemWidth();
         SetNextWindowSizeConstraints(Vector2.One * FileTreeSize, Vector2.One * FileTreeSize * 10);
         var initialTreeSize = GetContentRegionAvail() - GetTextLineHeightWithSpacing() * 2 * Vector2.UnitY;
-        BeginChild("TreeChildWindow", initialTreeSize, true, ImGuiWindowFlags.HorizontalScrollbar);
+        BeginChild("TreeChildWindow", initialTreeSize, ImGuiChildFlags.Border, ImGuiWindowFlags.HorizontalScrollbar);
         TreeContent();
         EndChild();
 

zzre/imgui/TwoColumnEditorTag.cs

@@ -45,7 +45,7 @@ private void HandleContent()
             ImGui.SetColumnWidth(0, Window.InitialBounds.Size.X * 0.3f);
             didSetColumnWidth++;
         }
-        ImGui.BeginChild("LeftColumn", ImGui.GetContentRegionAvail(), false, ImGuiWindowFlags.HorizontalScrollbar);
+        ImGui.BeginChild("LeftColumn", ImGui.GetContentRegionAvail(), ImGuiChildFlags.None, ImGuiWindowFlags.HorizontalScrollbar);
         var i = 0;
         foreach (var (name, content, isDefaultOpen, preContent) in infoSections)
         {