Merge branch 'master' into navigation

ago%!(EXTRA string=8 years) · b0fc30bd19
parent 7c5556c921
commit b0fc30bd19
1 changed files with 3 additions and 1 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@ -5725,7 +5725,8 @@ bool ImGui::IsWindowHovered()

 bool ImGui::IsWindowRectHovered()
 {
-    return GImGui->HoveredWindow == GImGui->CurrentWindow;
+    ImGuiContext& g = *GImGui;
+    return g.HoveredWindow == g.CurrentWindow;
 }

 bool ImGui::IsWindowFocused()
@ -7786,6 +7787,7 @@ bool ImGui::DragBehavior(const ImRect& frame_bb, ImGuiID id, float* v, float v_s

            if (v_speed == 0.0f && (v_max - v_min) != 0.0f && (v_max - v_min) < FLT_MAX)
                v_speed = (v_max - v_min) * g.DragSpeedDefaultRatio;
+
            if (g.ActiveIdSource == ImGuiInputSource_Nav)
                v_speed = ImMax(v_speed, GetMinimumStepAtDecimalPrecision(decimal_precision));