From c98318a914e2790aaf7456945af33875f183e712 Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 12 Aug 2015 22:46:39 -0600 Subject: [PATCH] Renaming some argument to clarify the local vs screen coordinates --- imgui.cpp | 18 +++++++++--------- imgui.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index aff5317a..73a40ba4 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -2690,13 +2690,13 @@ static ImGuiWindow* FindHoveredWindow(ImVec2 pos, bool excluding_childs) // Test if mouse cursor is hovering given rectangle // NB- Rectangle is clipped by our current clip setting // NB- Expand the rectangle to be generous on imprecise inputs systems (g.Style.TouchExtraPadding) -bool ImGui::IsMouseHoveringRect(const ImVec2& rect_min, const ImVec2& rect_max) +bool ImGui::IsMouseHoveringRect(const ImVec2& pos_min, const ImVec2& pos_max) { ImGuiState& g = *GImGui; ImGuiWindow* window = GetCurrentWindow(); // Clip - ImRect rect_clipped(rect_min, rect_max); + ImRect rect_clipped(pos_min, pos_max); rect_clipped.Clip(window->ClipRect); // Expand for touch input @@ -4603,10 +4603,10 @@ float ImGui::GetCursorPosY() return ImGui::GetCursorPos().y; } -void ImGui::SetCursorPos(const ImVec2& pos) +void ImGui::SetCursorPos(const ImVec2& local_pos) { ImGuiWindow* window = GetCurrentWindow(); - window->DC.CursorPos = window->Pos + pos; + window->DC.CursorPos = window->Pos + local_pos; window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos); } @@ -8380,11 +8380,11 @@ void ImGui::EndGroup() } // Gets back to previous line and continue with horizontal layout -// pos_x == 0 : follow on previous item -// pos_x != 0 : align to specified column +// local_pos_x == 0 : follow on previous item +// local_pos_x != 0 : align to specified column // spacing_w < 0 : use default spacing if column_x==0, no spacing if column_x!=0 // spacing_w >= 0 : enforce spacing -void ImGui::SameLine(float pos_x, float spacing_w) +void ImGui::SameLine(float local_pos_x, float spacing_w) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -8392,10 +8392,10 @@ void ImGui::SameLine(float pos_x, float spacing_w) ImGuiState& g = *GImGui; float x, y; - if (pos_x != 0.0f) + if (local_pos_x != 0.0f) { if (spacing_w < 0.0f) spacing_w = 0.0f; - x = window->Pos.x + pos_x + spacing_w; + x = window->Pos.x + local_pos_x + spacing_w; y = window->DC.CursorPosPrevLine.y; } else diff --git a/imgui.h b/imgui.h index 2063b8aa..e0cf6c66 100644 --- a/imgui.h +++ b/imgui.h @@ -180,7 +180,7 @@ namespace ImGui IMGUI_API void BeginGroup(); // once closing a group it is seen as a single item (so you can use IsItemHovered() on a group, SameLine() between groups, etc. IMGUI_API void EndGroup(); IMGUI_API void Separator(); // horizontal line - IMGUI_API void SameLine(float pos_x = 0.0f, float spacing_w = -1.0f); // call between widgets or groups to layout them horizontally + IMGUI_API void SameLine(float local_pos_x = 0.0f, float spacing_w = -1.0f); // call between widgets or groups to layout them horizontally IMGUI_API void Spacing(); // add spacing IMGUI_API void Dummy(const ImVec2& size); // add a dummy item of given size IMGUI_API void Indent(); // move content position toward the right by style.IndentSpacing pixels @@ -195,7 +195,7 @@ namespace ImGui IMGUI_API ImVec2 GetCursorPos(); // cursor position is relative to window position IMGUI_API float GetCursorPosX(); // " IMGUI_API float GetCursorPosY(); // " - IMGUI_API void SetCursorPos(const ImVec2& pos); // " + IMGUI_API void SetCursorPos(const ImVec2& local_pos); // " IMGUI_API void SetCursorPosX(float x); // " IMGUI_API void SetCursorPosY(float y); // " IMGUI_API ImVec2 GetCursorStartPos(); // initial cursor position @@ -395,7 +395,7 @@ namespace ImGui IMGUI_API bool IsMouseReleased(int button); // did mouse button released (went from Down to !Down) IMGUI_API bool IsMouseHoveringWindow(); // is mouse hovering current window ("window" in API names always refer to current window). disregarding of any consideration of being blocked by a popup. (unlike IsWindowHovered() this will return true even if the window is blocked because of a popup) IMGUI_API bool IsMouseHoveringAnyWindow(); // is mouse hovering any visible window - IMGUI_API bool IsMouseHoveringRect(const ImVec2& scr_min, const ImVec2& scr_max); // is mouse hovering given bounding rect (in screen space). disregarding of any consideration of focus/window ordering/blocked by a popup. + IMGUI_API bool IsMouseHoveringRect(const ImVec2& pos_min, const ImVec2& pos_max); // is mouse hovering given bounding rect (in screen space). clipped by current clipping settings. disregarding of consideration of focus/window ordering/blocked by a popup. IMGUI_API bool IsMouseDragging(int button = 0, float lock_threshold = -1.0f); // is mouse dragging. if lock_threshold < -1.0f uses io.MouseDraggingThreshold IMGUI_API ImVec2 GetMousePos(); // shortcut to ImGui::GetIO().MousePos provided by user, to be consistent with other calls IMGUI_API ImVec2 GetMouseDragDelta(int button = 0, float lock_threshold = -1.0f); // dragging amount since clicking, also see: GetItemActiveDragDelta(). if lock_threshold < -1.0f uses io.MouseDraggingThreshold