|
@ -895,13 +895,13 @@ void ImGui::Scrollbar(ImGuiAxis axis) |
|
|
ImRect bb; |
|
|
ImRect bb; |
|
|
if (axis == ImGuiAxis_X) |
|
|
if (axis == ImGuiAxis_X) |
|
|
{ |
|
|
{ |
|
|
bb.Min = ImVec2(inner_rect.Min.x, outer_rect.Max.y - border_size - scrollbar_size); |
|
|
bb.Min = ImVec2(inner_rect.Min.x, ImMax(outer_rect.Min.y, outer_rect.Max.y - border_size - scrollbar_size)); |
|
|
bb.Max = ImVec2(inner_rect.Max.x, outer_rect.Max.y); |
|
|
bb.Max = ImVec2(inner_rect.Max.x, outer_rect.Max.y); |
|
|
rounding_corners |= ImDrawCornerFlags_BotLeft; |
|
|
rounding_corners |= ImDrawCornerFlags_BotLeft; |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
bb.Min = ImVec2(outer_rect.Max.x - border_size - scrollbar_size, inner_rect.Min.y); |
|
|
bb.Min = ImVec2(ImMax(outer_rect.Min.x, outer_rect.Max.x - border_size - scrollbar_size), inner_rect.Min.y); |
|
|
bb.Max = ImVec2(outer_rect.Max.x, window->InnerRect.Max.y); |
|
|
bb.Max = ImVec2(outer_rect.Max.x, window->InnerRect.Max.y); |
|
|
rounding_corners |= ((window->Flags & ImGuiWindowFlags_NoTitleBar) && !(window->Flags & ImGuiWindowFlags_MenuBar)) ? ImDrawCornerFlags_TopRight : 0; |
|
|
rounding_corners |= ((window->Flags & ImGuiWindowFlags_NoTitleBar) && !(window->Flags & ImGuiWindowFlags_MenuBar)) ? ImDrawCornerFlags_TopRight : 0; |
|
|
} |
|
|
} |
|
|