From 919eb69931000e0a6426637862201e75671b223d Mon Sep 17 00:00:00 2001 From: ocornut Date: Sun, 24 Apr 2016 22:38:30 +0200 Subject: [PATCH] Scrollbar: minor fix for top-right rounding of scrollbar background when window has menubar but no title bar --- imgui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgui.cpp b/imgui.cpp index f7f92c0e..8da9c877 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -4212,7 +4212,7 @@ static void Scrollbar(ImGuiWindow* window, bool horizontal) if (horizontal) window_rounding_corners = 8 | (other_scrollbar ? 0 : 4); else - window_rounding_corners = ((window->Flags & ImGuiWindowFlags_NoTitleBar) ? 2 : 0) | (other_scrollbar ? 0 : 4); + window_rounding_corners = (((window->Flags & ImGuiWindowFlags_NoTitleBar) && !(window->Flags & ImGuiWindowFlags_MenuBar)) ? 2 : 0) | (other_scrollbar ? 0 : 4); window->DrawList->AddRectFilled(bb.Min, bb.Max, ImGui::GetColorU32(ImGuiCol_ScrollbarBg), window_rounding, window_rounding_corners); bb.Reduce(ImVec2(ImClamp((float)(int)((bb.Max.x - bb.Min.x - 2.0f) * 0.5f), 0.0f, 3.0f), ImClamp((float)(int)((bb.Max.y - bb.Min.y - 2.0f) * 0.5f), 0.0f, 3.0f)));