Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BTabView: Compose padding from BControlLook::DefaultLabelSpacing.

Browse Source 
Greatly improves appearance on HiDPI.
This commit is contained in:
Augustin Cavalier 2022-08-26 13:59:19 -04:00
parent 8ca91ead3d
commit f74699a934
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/kits/interface/TabView.cpp
View File

@ -1016,35 +1016,36 @@ BTabView::TabFrame(int32 index) const
if (index >= CountTabs() || index < 0) if (index >= CountTabs() || index < 0)
return BRect(); return BRect();
float width = 100.0f; const float padding = ceilf(be_control_look->DefaultLabelSpacing() * 3.3f);
float height = fTabHeight; const float height = fTabHeight;
float offset = BControlLook::ComposeSpacing(B_USE_WINDOW_SPACING); const float offset = BControlLook::ComposeSpacing(B_USE_WINDOW_SPACING);
BRect bounds(Bounds()); const BRect bounds(Bounds());
float width = padding * 5.0f;
switch (fTabWidthSetting) { switch (fTabWidthSetting) {
case B_WIDTH_FROM_LABEL: case B_WIDTH_FROM_LABEL:
{ {
float x = 0.0f; float x = 0.0f;
for (int32 i = 0; i < index; i++){ for (int32 i = 0; i < index; i++){
x += StringWidth(TabAt(i)->Label()) + 20.0f; x += StringWidth(TabAt(i)->Label()) + padding;
} }
switch (fTabSide) { switch (fTabSide) {
case kTopSide: case kTopSide:
return BRect(offset + x, 0.0f, return BRect(offset + x, 0.0f,
offset + x + StringWidth(TabAt(index)->Label()) + 20.0f, offset + x + StringWidth(TabAt(index)->Label()) + padding,
height); height);
case kBottomSide: case kBottomSide:
return BRect(offset + x, bounds.bottom - height, return BRect(offset + x, bounds.bottom - height,
offset + x + StringWidth(TabAt(index)->Label()) + 20.0f, offset + x + StringWidth(TabAt(index)->Label()) + padding,
bounds.bottom); bounds.bottom);
case kLeftSide: case kLeftSide:
return BRect(0.0f, offset + x, height, offset + x return BRect(0.0f, offset + x, height, offset + x
+ StringWidth(TabAt(index)->Label()) + 20.0f); + StringWidth(TabAt(index)->Label()) + padding);
case kRightSide: case kRightSide:
return BRect(bounds.right - height, offset + x, return BRect(bounds.right - height, offset + x,
bounds.right, offset + x bounds.right, offset + x
+ StringWidth(TabAt(index)->Label()) + 20.0f); + StringWidth(TabAt(index)->Label()) + padding);
default: default:
return BRect(); return BRect();
} }
@ -1053,7 +1054,7 @@ BTabView::TabFrame(int32 index) const
case B_WIDTH_FROM_WIDEST: case B_WIDTH_FROM_WIDEST:
width = 0.0; width = 0.0;
for (int32 i = 0; i < CountTabs(); i++) { for (int32 i = 0; i < CountTabs(); i++) {
float tabWidth = StringWidth(TabAt(i)->Label()) + 20.0f; float tabWidth = StringWidth(TabAt(i)->Label()) + padding;
if (tabWidth > width) if (tabWidth > width)
width = tabWidth; width = tabWidth;
} }
@ -1404,7 +1405,8 @@ BTabView::_InitObject(bool layouted, button_width width)
font_height fh; font_height fh;
GetFontHeight(&fh); GetFontHeight(&fh);
fTabHeight = ceilf(fh.ascent + fh.descent + fh.leading + 8.0f); fTabHeight = ceilf(fh.ascent + fh.descent + fh.leading +
(be_control_look->DefaultLabelSpacing() * 1.3f));
fContainerView = NULL; fContainerView = NULL;
_InitContainerView(layouted); _InitContainerView(layouted);