Преглед на файлове

Window rectangles: Made InnerRect not affected by window border sizes. its few users shouldn't be meaningfully affected.

omar преди 6 години
родител
ревизия
09bcf9fbc5
променени са 1 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 5 5
      imgui.cpp

+ 5 - 5
imgui.cpp

@@ -5519,15 +5519,15 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         window->OuterRectClipped.ClipWith(host_rect);
         window->OuterRectClipped.ClipWith(host_rect);
 
 
         // Inner rectangle
         // Inner rectangle
-        // Used by: 
+        // Not affected by window border size. Used by: 
         // - NavScrollToBringItemIntoView()
         // - NavScrollToBringItemIntoView()
         // - NavUpdatePageUpPageDown()
         // - NavUpdatePageUpPageDown()
         // - Scrollbar()
         // - Scrollbar()
         const ImRect title_bar_rect = window->TitleBarRect();
         const ImRect title_bar_rect = window->TitleBarRect();
-        window->InnerRect.Min.x = title_bar_rect.Min.x + window->WindowBorderSize;
-        window->InnerRect.Min.y = title_bar_rect.Max.y + window->MenuBarHeight() + (((flags & ImGuiWindowFlags_MenuBar) || !(flags & ImGuiWindowFlags_NoTitleBar)) ? style.FrameBorderSize : window->WindowBorderSize);
-        window->InnerRect.Max.x = window->Pos.x + window->Size.x - ImMax(window->ScrollbarSizes.x, window->WindowBorderSize);
-        window->InnerRect.Max.y = window->Pos.y + window->Size.y - ImMax(window->ScrollbarSizes.y, window->WindowBorderSize);
+        window->InnerRect.Min.x = title_bar_rect.Min.x;
+        window->InnerRect.Min.y = title_bar_rect.Max.y + window->MenuBarHeight();
+        window->InnerRect.Max.x = window->Pos.x + window->Size.x - window->ScrollbarSizes.x;
+        window->InnerRect.Max.y = window->Pos.y + window->Size.y - window->ScrollbarSizes.y;
 
 
         // Work rectangle.
         // Work rectangle.
         // Affected by window padding and border size. Used by:
         // Affected by window padding and border size. Used by: