瀏覽代碼

GetContentRegionMax() when window content size is explicit we don't adjust it with scrollbar sizes (#246)

ocornut 10 年之前
父節點
當前提交
6eed3dc7c8
共有 1 個文件被更改,包括 1 次插入4 次删除
  1. 1 4
      imgui.cpp

+ 1 - 4
imgui.cpp

@@ -4593,13 +4593,10 @@ void ImGui::SetNextWindowFocus()
 ImVec2 ImGui::GetContentRegionMax()
 {
     ImGuiWindow* window = GetCurrentWindowRead();
-    ImVec2 content_region_size = ImVec2(window->SizeContentsExplicit.x ? window->SizeContentsExplicit.x : window->Size.x, window->SizeContentsExplicit.y ? window->SizeContentsExplicit.y : window->Size.y);
+    ImVec2 content_region_size = ImVec2(window->SizeContentsExplicit.x ? window->SizeContentsExplicit.x : window->Size.x - window->ScrollbarSizes.x, window->SizeContentsExplicit.y ? window->SizeContentsExplicit.y : window->Size.y - window->ScrollbarSizes.y);
     ImVec2 mx = content_region_size - window->Scroll - window->WindowPadding;
     if (window->DC.ColumnsCount != 1)
         mx.x = ImGui::GetColumnOffset(window->DC.ColumnsCurrent + 1) - window->WindowPadding.x;
-    else
-        mx.x -= window->ScrollbarSizes.x;
-    mx.y -= window->ScrollbarSizes.y;
     return mx;
 }