Merge pull request #920 from FUSEEProjectTeam/dependabot/nuget/housek…

…eeping/ImGui.NET-1.91.0.1 Bump ImGui.NET from 1.90.9.1 to 1.91.0.1
FUSEEProjectTeam · Nov 7, 2024 · 8c97b6f · 8c97b6f
2 parents 9f44b05 + 410e882
commit 8c97b6f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/Examples/Complete/ImGui/Desktop/ImGuiApp.cs b/Examples/Complete/ImGui/Desktop/ImGuiApp.cs
@@ -111,17 +111,13 @@ public override void RenderAFrame()
             ImGui.Begin("Viewport",
               ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoCollapse);
 
-            var parentMin = ImGui.GetWindowContentRegionMin();
-            var parentMax = ImGui.GetWindowContentRegionMax();
-            var size = parentMax - parentMin;
+            var size = ImGui.GetContentRegionAvail();
 
             // Using a Child allow to fill all the space of the window.
             // It also allows customization
             ImGui.BeginChild("GameRender", size, ImGuiChildFlags.None, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove);
 
-            var fuseeViewportMin = ImGui.GetWindowContentRegionMin();
-            var fuseeViewportMax = ImGui.GetWindowContentRegionMax();
-            var fuseeViewportSize = fuseeViewportMax - fuseeViewportMin;
+            var fuseeViewportSize = ImGui.GetContentRegionAvail();
 
             ImGui.Image(_fuControl.RenderToTexture((int)size.X, (int)size.Y), fuseeViewportSize,
                 new Vector2(0, 1),

diff --git a/Examples/Complete/PointCloudPotree2/Core/PointRenderParams.cs b/Examples/Complete/PointCloudPotree2/Core/PointRenderParams.cs
@@ -63,7 +63,7 @@ public int Size
             set
             {
                 _size = value;
-                DepthPassEf.SetFxParam(UniformNameDeclarations.PointSizeHash, Size);
+                DepthPassEf.SetFxParam(UniformNameDeclarations.PointSizeHash, (float)Size);
                 ColorPassEf.PointSize = _size;
             }
         }

diff --git a/Examples/Complete/PointCloudPotree2/ImGui/ImGuiApp.cs b/Examples/Complete/PointCloudPotree2/ImGui/ImGuiApp.cs
@@ -129,17 +129,13 @@ public override void RenderAFrame()
             ImGui.Begin("Viewport",
               ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoCollapse);
 
-            var parentMin = ImGui.GetWindowContentRegionMin();
-            var parentMax = ImGui.GetWindowContentRegionMax();
-            var size = parentMax - parentMin;
+            var size = ImGui.GetContentRegionAvail();
 
             // Using a Child allow to fill all the space of the window.
             // It also allows customization
             ImGui.BeginChild("GameRender", size, ImGuiChildFlags.None, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove);
 
-            var fuseeViewportMin = ImGui.GetWindowContentRegionMin();
-            var fuseeViewportMax = ImGui.GetWindowContentRegionMax();
-            var fuseeViewportSize = fuseeViewportMax - fuseeViewportMin;
+            var fuseeViewportSize = ImGui.GetContentRegionAvail();
             var fuseeViewportPos = ImGui.GetWindowPos();
 
             var hndl = _fuControl.RenderToTexture((int)fuseeViewportSize.X, (int)fuseeViewportSize.Y);

diff --git a/src/ImGui/Desktop/Fusee.ImGui.Desktop/Fusee.ImGuiImp.Desktop.csproj b/src/ImGui/Desktop/Fusee.ImGui.Desktop/Fusee.ImGuiImp.Desktop.csproj
@@ -13,7 +13,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ImGui.NET" Version="1.90.9.1" />
+		<PackageReference Include="ImGui.NET" Version="1.91.0.1" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/ImGui/Desktop/Fusee.ImGui.Desktop/Templates/ImGuiFilePicker.cs b/src/ImGui/Desktop/Fusee.ImGui.Desktop/Templates/ImGuiFilePicker.cs
@@ -479,7 +479,7 @@ private void DrawFolderSelector(ref bool filePickerOpen)
 
                             ImGui.PushStyleColor(ImGuiCol.Text, FolderColor.ToUintColor());
 
-                            if (ImGui.Selectable(directory.Name + "/", CurrentlySelectedFolder == directory, ImGuiSelectableFlags.DontClosePopups | ImGuiSelectableFlags.AllowDoubleClick))
+                            if (ImGui.Selectable(directory.Name + "/", CurrentlySelectedFolder == directory, ImGuiSelectableFlags.NoAutoClosePopups | ImGuiSelectableFlags.AllowDoubleClick))
                             {
                                 SelectedFile = null;
                                 CurrentlySelectedFolder = directory;
@@ -501,7 +501,7 @@ private void DrawFolderSelector(ref bool filePickerOpen)
 
                             ImGui.PushStyleColor(ImGuiCol.Header, SelectedColor.ToUintColor());
 
-                            if (ImGui.Selectable(name, SelectedFile?.Name == name, ImGuiSelectableFlags.DontClosePopups | ImGuiSelectableFlags.AllowDoubleClick))
+                            if (ImGui.Selectable(name, SelectedFile?.Name == name, ImGuiSelectableFlags.NoAutoClosePopups | ImGuiSelectableFlags.AllowDoubleClick))
                             {
                                 if (ImGui.IsMouseDoubleClicked(0))
                                 {

diff --git a/src/ImGui/Desktop/Fusee.ImGui.Desktop/Templates/ImGuiFolderPicker.cs b/src/ImGui/Desktop/Fusee.ImGui.Desktop/Templates/ImGuiFolderPicker.cs
@@ -429,7 +429,7 @@ private void DrawFolderSelector(ref bool filePickerOpen)
                     {
                         ImGui.PushStyleColor(ImGuiCol.Text, FolderColor.ToUintColor());
                         ImGui.PushStyleColor(ImGuiCol.Header, SelectedColor.ToUintColor());
-                        if (ImGui.Selectable(name + "/", CurrentlySelectedFolder?.Name == name, ImGuiSelectableFlags.DontClosePopups | ImGuiSelectableFlags.AllowDoubleClick))
+                        if (ImGui.Selectable(name + "/", CurrentlySelectedFolder?.Name == name, ImGuiSelectableFlags.NoAutoClosePopups | ImGuiSelectableFlags.AllowDoubleClick))
                         {
                             if (ImGui.IsMouseDoubleClicked(0))
                             {
@@ -448,7 +448,7 @@ private void DrawFolderSelector(ref bool filePickerOpen)
                     {
                         // just print the files, but with lighter color
                         ImGui.PushStyleColor(ImGuiCol.Text, LightFileColor.ToUintColor());
-                        ImGui.Selectable(name, false, ImGuiSelectableFlags.DontClosePopups);
+                        ImGui.Selectable(name, false, ImGuiSelectableFlags.NoAutoClosePopups);
                         ImGui.PopStyleColor();
                     }
                 }