From 64f7896c1590b76f1af79d228aa52685106bb195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Sun, 17 Dec 2023 02:22:04 +0100 Subject: [PATCH] Updated ImGui to 1.90.1 --- GlitchyEditor/src/EditWindows/ComponentEditWindow.bf | 2 +- GlitchyEditor/src/EditWindows/ContentBrowserWindow.bf | 6 +++--- GlitchyEngine/vendor/imgui | 2 +- vendor/ImGui.NET | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GlitchyEditor/src/EditWindows/ComponentEditWindow.bf b/GlitchyEditor/src/EditWindows/ComponentEditWindow.bf index 31dafc8..6a0f399 100644 --- a/GlitchyEditor/src/EditWindows/ComponentEditWindow.bf +++ b/GlitchyEditor/src/EditWindows/ComponentEditWindow.bf @@ -122,7 +122,7 @@ namespace GlitchyEditor.EditWindows ImGui.PushID(header); - bool nodeOpen = ImGui.TreeNodeEx(header.CStr(), .DefaultOpen | .AllowItemOverlap | .Framed | .SpanFullWidth); + bool nodeOpen = ImGui.TreeNodeEx(header.CStr(), .DefaultOpen | .AllowOverlap | .Framed | .SpanFullWidth); if (showComponentContextMenu != null) { diff --git a/GlitchyEditor/src/EditWindows/ContentBrowserWindow.bf b/GlitchyEditor/src/EditWindows/ContentBrowserWindow.bf index ecd3ce2..fdb222d 100644 --- a/GlitchyEditor/src/EditWindows/ContentBrowserWindow.bf +++ b/GlitchyEditor/src/EditWindows/ContentBrowserWindow.bf @@ -464,7 +464,7 @@ namespace GlitchyEditor.EditWindows float2 DirectoryItemSize = IconSize + (float2)ImGui.GetStyle().WindowPadding * 2 + float2(0, ImGui.GetFontSize()); - ImGui.BeginChild("item", (.)DirectoryItemSize, false, .NoScrollbar); + ImGui.BeginChild("item", (.)DirectoryItemSize, .None, .NoScrollbar); if (entry->Path == _selectedFile) { @@ -546,7 +546,7 @@ namespace GlitchyEditor.EditWindows float2 DirectoryItemSize = IconSize + (float2)ImGui.GetStyle().WindowPadding * 2 + float2(0, ImGui.GetFontSize()); - ImGui.BeginChild("item", (.)DirectoryItemSize, false, .NoScrollbar); + ImGui.BeginChild("item", (.)DirectoryItemSize, .None, .NoScrollbar); if (entry->Path == _selectedFile) { @@ -690,7 +690,7 @@ namespace GlitchyEditor.EditWindows float2 DirectoryItemSize = IconSize + (float2)ImGui.GetStyle().WindowPadding * 2 + float2(0, ImGui.GetFontSize()); - ImGui.BeginChild("item", (.)DirectoryItemSize, false, .NoScrollbar); + ImGui.BeginChild("item", (.)DirectoryItemSize, .None, .NoScrollbar); ImGui.PushStyleColor(.Button, ImGui.Vec4(0, 0, 0, 0)); diff --git a/GlitchyEngine/vendor/imgui b/GlitchyEngine/vendor/imgui index 21c9c32..98fd910 160000 --- a/GlitchyEngine/vendor/imgui +++ b/GlitchyEngine/vendor/imgui @@ -1 +1 @@ -Subproject commit 21c9c3225a5a2b125e67d51cc3ef31c0dcb654db +Subproject commit 98fd910228b3d7df3c1247615ac167977ed6c510 diff --git a/vendor/ImGui.NET b/vendor/ImGui.NET index 10d76c3..6ad3d45 160000 --- a/vendor/ImGui.NET +++ b/vendor/ImGui.NET @@ -1 +1 @@ -Subproject commit 10d76c3e726a0343fa671f179b7dbeb33f07e8a7 +Subproject commit 6ad3d456b794ee3245db10e7566e02407f92e9af