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

BTabView: Remove borderOffset, no longer useful

Browse Source
This commit is contained in:
John Scipione
2016-04-29 14:31:32 -07:00
parent 1eb0579044
commit 76b2ce77bf
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/TabView.cpp
+4 -11
View File
@@ -863,14 +863,8 @@ BTabView::TabFrame(int32 index) const
float width = 100.0f; float width = 100.0f;
float height = fTabHeight; float height = fTabHeight;
float borderOffset = 0.0f;
float offset = BControlLook::ComposeSpacing(B_USE_WINDOW_SPACING); float offset = BControlLook::ComposeSpacing(B_USE_WINDOW_SPACING);
// Do not use 2.0f for B_NO_BORDER, that will look yet different
// again (handled in DrawTabs()).
if (fBorderStyle == B_PLAIN_BORDER)
borderOffset = 1.0f;
switch (fTabWidthSetting) { switch (fTabWidthSetting) {
case B_WIDTH_FROM_LABEL: case B_WIDTH_FROM_LABEL:
{ {
@@ -879,9 +873,8 @@ BTabView::TabFrame(int32 index) const
x += StringWidth(TabAt(i)->Label()) + 20.0f; x += StringWidth(TabAt(i)->Label()) + 20.0f;
} }
return BRect(offset + x - borderOffset, 0.0f, return BRect(offset + x, 0.0f,
offset + x + StringWidth(TabAt(index)->Label()) + 20.0f offset + x + StringWidth(TabAt(index)->Label()) + 20.0f,
- borderOffset,
height); height);
} }
@@ -896,8 +889,8 @@ BTabView::TabFrame(int32 index) const
case B_WIDTH_AS_USUAL: case B_WIDTH_AS_USUAL:
default: default:
return BRect(offset + index * width - borderOffset, 0.0f, return BRect(offset + index * width, 0.0f,
offset + index * width + width - borderOffset, height); offset + index * width + width, height);
} }
// TODO: fix to remove "offset" in DrawTab and DrawLabel ... // TODO: fix to remove "offset" in DrawTab and DrawLabel ...