mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-13 21:19:02 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into navigation

Browse Source
This commit is contained in:
omar 2017-08-22 20:49:02 +08:00
parent 7c5556c921
commit b0fc30bd19
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imgui.cpp
View File

@ -5725,7 +5725,8 @@ bool ImGui::IsWindowHovered()
bool ImGui::IsWindowRectHovered() bool ImGui::IsWindowRectHovered()
{ {
return GImGui->HoveredWindow == GImGui->CurrentWindow; ImGuiContext& g = *GImGui;
return g.HoveredWindow == g.CurrentWindow;
} }
bool ImGui::IsWindowFocused() 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) 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; v_speed = (v_max - v_min) * g.DragSpeedDefaultRatio;
if (g.ActiveIdSource == ImGuiInputSource_Nav) if (g.ActiveIdSource == ImGuiInputSource_Nav)
v_speed = ImMax(v_speed, GetMinimumStepAtDecimalPrecision(decimal_precision)); v_speed = ImMax(v_speed, GetMinimumStepAtDecimalPrecision(decimal_precision));