From 269de6accafdc14aed708443588307f8e9d07d0c Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 31 May 2023 13:33:24 -0400 Subject: [PATCH] BScrollView: Take both minimum dimensions of scrollbars into account. Fixes #5678. --- src/kits/interface/ScrollView.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kits/interface/ScrollView.cpp b/src/kits/interface/ScrollView.cpp index e67e0b1b71..eda3f860e2 100644 --- a/src/kits/interface/ScrollView.cpp +++ b/src/kits/interface/ScrollView.cpp @@ -916,10 +916,14 @@ BScrollView::_AlignScrollBars(bool horizontal, bool vertical, BRect targetFrame) BScrollView::_ComputeFrame(BRect frame, BScrollBar* horizontal, BScrollBar* vertical, border_style border, uint32 borders) { - if (vertical != NULL) + if (vertical != NULL) { frame.right += vertical->PreferredSize().Width(); - if (horizontal != NULL) + frame.bottom += vertical->MinSize().Height(); + } + if (horizontal != NULL) { + frame.right += horizontal->MinSize().Width(); frame.bottom += horizontal->PreferredSize().Height(); + } _InsetBorders(frame, border, borders, true);