Browse Source

Refactor moving ID stack functions to their own section.

ocornut 1 year ago
parent
commit
0bf134a8e2
1 changed files with 17 additions and 13 deletions
  1. 17 13
      imgui.cpp

+ 17 - 13
imgui.cpp

@@ -77,6 +77,7 @@ CODE
 // [SECTION] RENDER HELPERS
 // [SECTION] RENDER HELPERS
 // [SECTION] INITIALIZATION, SHUTDOWN
 // [SECTION] INITIALIZATION, SHUTDOWN
 // [SECTION] MAIN CODE (most of the code! lots of stuff, needs tidying up!)
 // [SECTION] MAIN CODE (most of the code! lots of stuff, needs tidying up!)
+// [SECTION] ID STACK
 // [SECTION] INPUTS
 // [SECTION] INPUTS
 // [SECTION] ERROR CHECKING
 // [SECTION] ERROR CHECKING
 // [SECTION] ITEM SUBMISSION
 // [SECTION] ITEM SUBMISSION
@@ -7983,6 +7984,22 @@ ImGuiStorage* ImGui::GetStateStorage()
     return window->DC.StateStorage;
     return window->DC.StateStorage;
 }
 }
 
 
+bool ImGui::IsRectVisible(const ImVec2& size)
+{
+    ImGuiWindow* window = GImGui->CurrentWindow;
+    return window->ClipRect.Overlaps(ImRect(window->DC.CursorPos, window->DC.CursorPos + size));
+}
+
+bool ImGui::IsRectVisible(const ImVec2& rect_min, const ImVec2& rect_max)
+{
+    ImGuiWindow* window = GImGui->CurrentWindow;
+    return window->ClipRect.Overlaps(ImRect(rect_min, rect_max));
+}
+
+//-----------------------------------------------------------------------------
+// [SECTION] ID STACK
+//-----------------------------------------------------------------------------
+
 void ImGui::PushID(const char* str_id)
 void ImGui::PushID(const char* str_id)
 {
 {
     ImGuiContext& g = *GImGui;
     ImGuiContext& g = *GImGui;
@@ -8071,19 +8088,6 @@ ImGuiID ImGui::GetID(const void* ptr_id)
     return window->GetID(ptr_id);
     return window->GetID(ptr_id);
 }
 }
 
 
-bool ImGui::IsRectVisible(const ImVec2& size)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ClipRect.Overlaps(ImRect(window->DC.CursorPos, window->DC.CursorPos + size));
-}
-
-bool ImGui::IsRectVisible(const ImVec2& rect_min, const ImVec2& rect_max)
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ClipRect.Overlaps(ImRect(rect_min, rect_max));
-}
-
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // [SECTION] INPUTS
 // [SECTION] INPUTS
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------