commit c501c2d4cdd46e2906d5d3c52d587e988a461036
author ocornut <omarcornut@gmail.com> Thu Mar 16 14:48:35 2023 +0100
committer ocornut <omarcornut@gmail.com> Thu Mar 16 15:15:12 2023 +0100
tree 45decbd09da6ec11ae258e38078400fa13112cb2
parent 91577c7f519f127298a42c9fac78260cb11aa6e9

Internals: inverted a block in InputScalar() to facilitate reading/stepping in common case.

imgui_widgets.cpp

diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 6df09b1..884bb99 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -3450,7 +3450,12 @@
     flags |= ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_NoMarkEdited; // We call MarkItemEdited() ourselves by comparing the actual data rather than the string.
 
     bool value_changed = false;
-    if (p_step != NULL)
+    if (p_step == NULL)
+    {
+        if (InputText(label, buf, IM_ARRAYSIZE(buf), flags))
+            value_changed = DataTypeApplyFromText(buf, data_type, p_data, format);
+    }
+    else
     {
         const float button_size = GetFrameHeight();
 
@@ -3493,11 +3498,6 @@
         PopID();
         EndGroup();
     }
-    else
-    {
-        if (InputText(label, buf, IM_ARRAYSIZE(buf), flags))
-            value_changed = DataTypeApplyFromText(buf, data_type, p_data, format);
-    }
     if (value_changed)
         MarkItemEdited(g.LastItemData.ID);
 
@@ -4104,7 +4104,7 @@
 
     float scroll_y = is_multiline ? draw_window->Scroll.y : FLT_MAX;
 
-    const bool init_changed_specs = (state != NULL && state->Stb.single_line != !is_multiline);
+    const bool init_changed_specs = (state != NULL && state->Stb.single_line != !is_multiline); // state != NULL means its our state.
     const bool init_make_active = (user_clicked || user_scroll_finish || input_requested_by_nav || input_requested_by_tabbing);
     const bool init_state = (init_make_active || user_scroll_active);
     if ((init_state && g.ActiveId != id) || init_changed_specs)