Bump version to 1.0.48;

TreeNode text color switches with theme, if set by the framework; Put ImGuiCol's as disabled colors for components (TextDisabled for consistency); Fix size calculation for ArrowButtons;
FanTranslatorsInternational · Dec 17, 2023 · a28d180 · a28d180
1 parent ef7194c
commit a28d180
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 28 deletions.
diff --git a/ImGui.Forms/Controls/ArrowButton.cs b/ImGui.Forms/Controls/ArrowButton.cs
@@ -10,6 +10,9 @@ namespace ImGui.Forms.Controls
 {
     public class ArrowButton : Component
     {
+        private const int ButtonSizeX_ = 11;
+        private const int ButtonSizeY_ = 13;
+
         public KeyCommand KeyAction { get; set; }
 
         public ImGuiDir Direction { get; set; } = ImGuiDir.None;
@@ -22,10 +25,9 @@ public class ArrowButton : Component
 
         public override Size GetSize()
         {
-            var height = FontResource.GetCurrentLineHeight();
             var padding = ImGuiNET.ImGui.GetStyle().FramePadding;
 
-            return new Size((int)Math.Ceiling(height + padding.X * 2), (int)Math.Ceiling(height + padding.Y * 2));
+            return new Size((int)Math.Ceiling(ButtonSizeX_ + padding.X * 2), (int)Math.Ceiling(ButtonSizeY_ + padding.Y * 2));
         }
 
         protected override void UpdateInternal(Rectangle contentRect)
@@ -34,9 +36,9 @@ protected override void UpdateInternal(Rectangle contentRect)
 
             if (!enabled)
             {
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.Button, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonHovered, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonActive, 0xFF666666);
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.Button, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonHovered, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonActive, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
             }
 
             if ((ImGuiNET.ImGui.ArrowButton($"##{Id}", Direction) || IsKeyDown(KeyAction)) && Enabled)
@@ -48,7 +50,7 @@ protected override void UpdateInternal(Rectangle contentRect)
 
         private void OnClicked()
         {
-            Clicked?.Invoke(this, new EventArgs());
+            Clicked?.Invoke(this, EventArgs.Empty);
         }
     }
 }
diff --git a/ImGui.Forms/Controls/Button.cs b/ImGui.Forms/Controls/Button.cs
@@ -70,9 +70,9 @@ private void ApplyStyles(bool enabled, FontResource font)
         {
             if (!enabled)
             {
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.Button, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonHovered, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonActive, 0xFF666666);
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.Button, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonHovered, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonActive, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
             }
 
             if (font != null)

diff --git a/ImGui.Forms/Controls/CheckBox.cs b/ImGui.Forms/Controls/CheckBox.cs
@@ -54,10 +54,10 @@ private void ApplyStyles(bool enabled)
         {
             if (!enabled)
             {
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.CheckMark, 0xFF999999);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBg, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgActive, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgHovered, 0xFF666666);
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.CheckMark, ImGuiNET.ImGui.GetColorU32(ImGuiCol.Text));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBg, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgActive, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgHovered, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
             }
         }
 

diff --git a/ImGui.Forms/Controls/ImageButton.cs b/ImGui.Forms/Controls/ImageButton.cs
@@ -73,9 +73,9 @@ private void ApplyStyles(bool enabled)
         {
             if (!enabled)
             {
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.Button, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonHovered, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonActive, 0xFF666666);
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.Button, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonHovered, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.ButtonActive, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
             }
 
             ImGuiNET.ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Padding);

diff --git a/ImGui.Forms/Controls/MultiLineTextBox.cs b/ImGui.Forms/Controls/MultiLineTextBox.cs
@@ -55,9 +55,9 @@ protected override void UpdateInternal(Rectangle contentRect)
 
             if (isReadonly || !enabled)
             {
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBg, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgActive, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgHovered, 0xFF666666);
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBg, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgActive, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgHovered, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
             }
 
             if (ImGuiNET.ImGui.InputTextMultiline($"##{Id}", ref _text, MaxCharacters, contentRect.Size, flags))

diff --git a/ImGui.Forms/Controls/TextBox.cs b/ImGui.Forms/Controls/TextBox.cs
@@ -1,12 +1,12 @@
 using System;
-using System.Diagnostics;
 using System.Numerics;
 using ImGui.Forms.Controls.Base;
 using ImGui.Forms.Localization;
 using ImGui.Forms.Models;
 using ImGui.Forms.Resources;
 using ImGuiNET;
-using Veldrid;
+using Rectangle = Veldrid.Rectangle;
+using Size = ImGui.Forms.Models.Size;
 
 namespace ImGui.Forms.Controls
 {
@@ -113,9 +113,9 @@ protected override void UpdateInternal(Rectangle contentRect)
 
             if (isReadonly || !enabled)
             {
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBg, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgActive, 0xFF666666);
-                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgHovered, 0xFF666666);
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBg, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgActive, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
+                ImGuiNET.ImGui.PushStyleColor(ImGuiCol.FrameBgHovered, ImGuiNET.ImGui.GetColorU32(ImGuiCol.TextDisabled));
             }
 
             if (!string.IsNullOrEmpty(Placeholder))

diff --git a/ImGui.Forms/Controls/Tree/TreeNode.cs b/ImGui.Forms/Controls/Tree/TreeNode.cs
@@ -15,7 +15,7 @@ public class TreeNode<TNodeData>
 
         public LocalizedString Text { get; set; } = string.Empty;
 
-        public Color TextColor { get; set; }
+        public Color TextColor { get; set; } = Color.Empty;
 
         public FontResource Font { get; set; }
 

diff --git a/ImGui.Forms/Controls/Tree/TreeView.cs b/ImGui.Forms/Controls/Tree/TreeView.cs
@@ -81,7 +81,7 @@ private void UpdateNodes(IList<TreeNode<TNodeData>> nodes, ref bool nodeHovered)
                 ImGuiNET.ImGui.PushID(nodeId);
                 ImGuiNET.ImGui.SetNextItemOpen(node.IsExpanded);
 
-                if (node.TextColor != Color.Empty)
+                if (node.TextColor.IsEmpty)
                     ImGuiNET.ImGui.PushStyleColor(ImGuiCol.Text, node.TextColor.ToUInt32());
 
                 if (node.Font != null)
@@ -95,7 +95,7 @@ private void UpdateNodes(IList<TreeNode<TNodeData>> nodes, ref bool nodeHovered)
                 if (node.Font != null)
                     ImGuiNET.ImGui.PopFont();
 
-                if (node.TextColor != Color.Empty)
+                if (node.TextColor.IsEmpty)
                     ImGuiNET.ImGui.PopStyleColor();
 
                 ImGuiNET.ImGui.PopID();

diff --git a/ImGui.Forms/ImGui.Forms.nuspec b/ImGui.Forms/ImGui.Forms.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Imgui.Forms</id>
-    <version>1.0.47</version>
+    <version>1.0.48</version>
     <description>A WinForms-inspired object-oriented framework around Dear ImGui (https://github.com/ocornut/imgui)</description>
 
     <authors>onepiecefreak</authors>