i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BScrollView: Only adjust other dimension if it's greater-than-zero.

Browse Source 
And add an inline comment with a bit of explanation,
since this logic has now been revised multiple times.

Fixes #18690.
This commit is contained in:
Augustin Cavalier
2024-05-29 19:31:58 -04:00
parent fb79b8994f
commit 2b06e3ea48
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ScrollView.cpp
+9 -5
View File
@@ -916,18 +916,22 @@ BScrollView::_AlignScrollBars(bool horizontal, bool vertical, BRect targetFrame)
BScrollView::_ComputeFrame(BRect frame, BScrollBar* horizontal, BScrollView::_ComputeFrame(BRect frame, BScrollBar* horizontal,
BScrollBar* vertical, border_style border, uint32 borders) BScrollBar* vertical, border_style border, uint32 borders)
{ {
if (vertical != NULL) { if (vertical != NULL)
frame.right += vertical->PreferredSize().Width(); frame.right += vertical->PreferredSize().Width();
if (horizontal != NULL)
frame.bottom += horizontal->PreferredSize().Height();
// Take the other minimum dimensions into account, too, but only if
// the frame already has a greater-than-zero value for them. Otherwise,
// non-layouted applications could wind up with broken layouts.
if (vertical != NULL) {
const float minHeight = vertical->MinSize().Height(); const float minHeight = vertical->MinSize().Height();
if (frame.Height() >= 0 && frame.Height() < minHeight) if (frame.Height() > 0 && frame.Height() < minHeight)
frame.bottom += minHeight - frame.Height(); frame.bottom += minHeight - frame.Height();
} }
if (horizontal != NULL) { if (horizontal != NULL) {
frame.bottom += horizontal->PreferredSize().Height();
const float minWidth = horizontal->MinSize().Width(); const float minWidth = horizontal->MinSize().Width();
if (frame.Width() >= 0 && frame.Width() < minWidth) if (frame.Width() > 0 && frame.Width() < minWidth)
frame.right += minWidth - frame.Width(); frame.right += minWidth - frame.Width();
} }