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

BButton: Adjust the spacing and minimum values to use LabelSpacing.

Browse Source 
Seems to fix the last part of #16180.
This commit is contained in:
Augustin Cavalier
2022-08-26 22:29:29 -04:00
parent d56ff162fb
commit e038086025
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Button.cpp
+12 -9
View File
@@ -46,9 +46,11 @@ BButton::BButton(BRect frame, const char* name, const char* label,
fPopUpMessage(NULL) fPopUpMessage(NULL)
{ {
// Resize to minimum height if needed // Resize to minimum height if needed
BFont font;
GetFont(&font);
font_height fh; font_height fh;
GetFontHeight(&fh); font.GetHeight(&fh);
float minHeight = 12.0f + (float)ceil(fh.ascent + fh.descent); float minHeight = font.Size() + (float)ceil(fh.ascent + fh.descent);
if (Bounds().Height() < minHeight) if (Bounds().Height() < minHeight)
ResizeTo(Bounds().Width(), minHeight); ResizeTo(Bounds().Width(), minHeight);
} }
@@ -649,12 +651,13 @@ BButton::_ValidatePreferredSize()
left, top, right, bottom); left, top, right, bottom);
// width // width
float width = left + right + be_control_look->DefaultLabelSpacing() - 1; const float labelSpacing = be_control_look->DefaultLabelSpacing();
float width = left + right + labelSpacing - 1;
const char* label = Label(); const char* label = Label();
if (label != NULL) { if (label != NULL) {
width = std::max(width, 20.0f); width = std::max(width, ceilf(labelSpacing * 3.3f));
width += (float)ceil(StringWidth(label)); width += ceilf(StringWidth(label));
} }
const BBitmap* icon = IconBitmap(B_INACTIVE_ICON_BITMAP); const BBitmap* icon = IconBitmap(B_INACTIVE_ICON_BITMAP);
@@ -662,10 +665,10 @@ BButton::_ValidatePreferredSize()
width += icon->Bounds().Width() + 1; width += icon->Bounds().Width() + 1;
if (label != NULL && icon != NULL) if (label != NULL && icon != NULL)
width += be_control_look->DefaultLabelSpacing(); width += labelSpacing;
// height // height
float minHorizontalMargins = top + bottom + be_control_look->DefaultLabelSpacing(); float minHorizontalMargins = top + bottom + labelSpacing;
float height = -1; float height = -1;
if (label != NULL) { if (label != NULL) {
@@ -684,8 +687,8 @@ BButton::_ValidatePreferredSize()
} }
// force some minimum width/height values // force some minimum width/height values
width = std::max(width, label != NULL ? 75.0f : 5.0f); width = std::max(width, label != NULL ? (labelSpacing * 12.5f) : labelSpacing);
height = std::max(height, 5.0f); height = std::max(height, labelSpacing);
fPreferredSize.Set(width, height); fPreferredSize.Set(width, height);