some settings cleanup and finishing

domportera · Oct 8, 2022 · 03789bd · 03789bd
1 parent d911835
commit 03789bd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/T3/Gui/SettingsUi.cs b/T3/Gui/SettingsUi.cs
@@ -41,6 +41,11 @@ public static bool DrawSettingsTable(string tableID, UIControlledSetting[] setti
             return changed;
         }
 
+        /// <summary>
+        /// Draws a series of settings in order
+        /// </summary>
+        /// <param name="settings"></param>
+        /// <returns></returns>
         public static bool DrawSettings(UIControlledSetting[] settings)
         {
             ImGui.NewLine();

diff --git a/T3/Gui/UiHelpers/UIControlledSetting.cs b/T3/Gui/UiHelpers/UIControlledSetting.cs
@@ -63,21 +63,16 @@ public UIControlledSetting(string label, Func<string, bool> guiFunc, string tool
         /// If an Action was provided in constructor, it will be executed when value is changed. </returns>
         public bool DrawGUIControl()
         {
-            //if (!string.IsNullOrEmpty(tooltip))
-            //{
-            //    if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
-            //    {
-            //        ImGui.SetTooltip(tooltip);
-            //    }
-            //}
-
-            var changed = guiFunc.Invoke();
-
             if (!string.IsNullOrEmpty(tooltip))
             {
-                CustomComponents.TooltipForLastItem(tooltip, additionalNotes);
+                if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
+                {
+                    ImGui.SetTooltip(tooltip);
+                }
             }
 
+            var changed = guiFunc.Invoke();
+
             if(changed)
             {
                 OnValueChanged?.Invoke();

diff --git a/T3/Gui/Windows/SettingsInSettingsWindow.cs b/T3/Gui/Windows/SettingsInSettingsWindow.cs
@@ -88,19 +88,19 @@ public partial class SettingsWindow
             new UIControlledSetting
             (
                 label: "Smoothing",
-                guiFunc: (string guiLabel) => ImGui.DragFloat(guiLabel, ref UserSettings.Config.SpaceMouseDamping, 0.01f, 0.01f, 1f)
+                guiFunc: (string guiLabel) => CustomComponents.FloatValueEdit(guiLabel, ref UserSettings.Config.SpaceMouseDamping, 0.01f, 1f)
             ),
 
             new UIControlledSetting
             (
                 label: "Move Speed",
-                guiFunc: (string guiLabel) => ImGui.DragFloat(guiLabel, ref UserSettings.Config.SpaceMouseMoveSpeedFactor, 0.01f, 0, 10f)
+                guiFunc: (string guiLabel) => CustomComponents.FloatValueEdit(guiLabel, ref UserSettings.Config.SpaceMouseMoveSpeedFactor, 0, 10f)
             ),
 
             new UIControlledSetting
             (
                 label: "Rotation Speed",
-                guiFunc: (string guiLabel) => ImGui.DragFloat(guiLabel, ref UserSettings.Config.SpaceMouseRotationSpeedFactor, 0.01f, 0, 10f)
+                guiFunc: (string guiLabel) => CustomComponents.FloatValueEdit(guiLabel, ref UserSettings.Config.SpaceMouseRotationSpeedFactor, 0, 10f)
             )
         };