Browse Source

Internals: DragFloat: Removed DragSpeedScaleFast/DragSpeedScaleSlow since it's not yet usable and Nav version doesn't have an equivalent.

omar 7 năm trước cách đây
mục cha
commit
3f04fd0644
2 tập tin đã thay đổi với 4 bổ sung8 xóa
  1. 4 4
      imgui.cpp
  2. 0 4
      imgui_internal.h

+ 4 - 4
imgui.cpp

@@ -9154,10 +9154,10 @@ bool ImGui::DragBehavior(const ImRect& frame_bb, ImGuiID id, float* v, float v_s
     if (g.ActiveIdSource == ImGuiInputSource_Mouse && IsMousePosValid())
     if (g.ActiveIdSource == ImGuiInputSource_Mouse && IsMousePosValid())
     {
     {
         adjust_delta = mouse_drag_delta.x - g.DragLastMouseDelta.x;
         adjust_delta = mouse_drag_delta.x - g.DragLastMouseDelta.x;
-        if (g.IO.KeyShift && g.DragSpeedScaleFast >= 0.0f)
-            adjust_delta *= g.DragSpeedScaleFast;
-        if (g.IO.KeyAlt && g.DragSpeedScaleSlow >= 0.0f)
-            adjust_delta *= g.DragSpeedScaleSlow;
+        if (g.IO.KeyAlt)
+            adjust_delta *= 1.0f/100.0f;
+        if (g.IO.KeyShift)
+            adjust_delta *= 10.0f;
         g.DragLastMouseDelta.x = mouse_drag_delta.x;
         g.DragLastMouseDelta.x = mouse_drag_delta.x;
     }
     }
     if (g.ActiveIdSource == ImGuiInputSource_Nav)
     if (g.ActiveIdSource == ImGuiInputSource_Nav)

+ 0 - 4
imgui_internal.h

@@ -671,8 +671,6 @@ struct ImGuiContext
     float                   DragCurrentValue;                   // Currently dragged value, always float, not rounded by end-user precision settings
     float                   DragCurrentValue;                   // Currently dragged value, always float, not rounded by end-user precision settings
     ImVec2                  DragLastMouseDelta;
     ImVec2                  DragLastMouseDelta;
     float                   DragSpeedDefaultRatio;              // If speed == 0.0f, uses (max-min) * DragSpeedDefaultRatio
     float                   DragSpeedDefaultRatio;              // If speed == 0.0f, uses (max-min) * DragSpeedDefaultRatio
-    float                   DragSpeedScaleSlow;
-    float                   DragSpeedScaleFast;
     ImVec2                  ScrollbarClickDeltaToGrabCenter;    // Distance between mouse and center of grab box, normalized in parent space. Use storage?
     ImVec2                  ScrollbarClickDeltaToGrabCenter;    // Distance between mouse and center of grab box, normalized in parent space. Use storage?
     int                     TooltipOverrideCount;
     int                     TooltipOverrideCount;
     ImVector<char>          PrivateClipboard;                   // If no custom clipboard handler is defined
     ImVector<char>          PrivateClipboard;                   // If no custom clipboard handler is defined
@@ -776,8 +774,6 @@ struct ImGuiContext
         DragCurrentValue = 0.0f;
         DragCurrentValue = 0.0f;
         DragLastMouseDelta = ImVec2(0.0f, 0.0f);
         DragLastMouseDelta = ImVec2(0.0f, 0.0f);
         DragSpeedDefaultRatio = 1.0f / 100.0f;
         DragSpeedDefaultRatio = 1.0f / 100.0f;
-        DragSpeedScaleSlow = 1.0f / 100.0f;
-        DragSpeedScaleFast = 10.0f;
         ScrollbarClickDeltaToGrabCenter = ImVec2(0.0f, 0.0f);
         ScrollbarClickDeltaToGrabCenter = ImVec2(0.0f, 0.0f);
         TooltipOverrideCount = 0;
         TooltipOverrideCount = 0;
         PlatformImePos = PlatformImeLastPos = ImVec2(FLT_MAX, FLT_MAX);
         PlatformImePos = PlatformImeLastPos = ImVec2(FLT_MAX, FLT_MAX);