diff --git a/src/apps/webpositive/WebPositive.rdef b/src/apps/webpositive/WebPositive.rdef index b382c9559b..1eb69fe694 100644 --- a/src/apps/webpositive/WebPositive.rdef +++ b/src/apps/webpositive/WebPositive.rdef @@ -327,5 +327,3 @@ resource(205, "kActionGo") archive BBitmap { $"0000000000000000000000000000000000000000000000000000000000000000" } }; - - diff --git a/src/apps/webpositive/tabview/TabContainerView.cpp b/src/apps/webpositive/tabview/TabContainerView.cpp index cca2380469..8f9c899975 100644 --- a/src/apps/webpositive/tabview/TabContainerView.cpp +++ b/src/apps/webpositive/tabview/TabContainerView.cpp @@ -227,6 +227,7 @@ TabContainerView::AddTab(TabView* tab, int32 index) _ValidateTabVisibility(); } + TabView* TabContainerView::RemoveTab(int32 index) { @@ -330,9 +331,8 @@ TabContainerView::SelectTab(TabView* tab) if (fSelectedTab != NULL) index = GroupLayout()->IndexOfItem(tab->LayoutItem()); - if (!tab->LayoutItem()->IsVisible()) { + if (!tab->LayoutItem()->IsVisible()) SetFirstVisibleTabIndex(index); - } fController->TabSelected(index); } @@ -539,4 +539,3 @@ TabContainerView::_SendFakeMouseMoved() if (Bounds().Contains(where)) _MouseMoved(where, B_INSIDE_VIEW, NULL); } - diff --git a/src/apps/webpositive/tabview/TabView.cpp b/src/apps/webpositive/tabview/TabView.cpp index 3bb78ec185..7caeaaf71f 100644 --- a/src/apps/webpositive/tabview/TabView.cpp +++ b/src/apps/webpositive/tabview/TabView.cpp @@ -93,25 +93,28 @@ TabView::Draw(BRect updateRect) { BRect frame(fLayoutItem->Frame()); if (fIsFront) { - // Extend the front tab outward left/right in order to merge - // the frames of adjacent tabs. - if (!fIsFirst) - frame.left--; - if (!fIsLast) - frame.right++; + // Extend the front tab outward left/right in order to merge + // the frames of adjacent tabs. + if (!fIsFirst) + frame.left--; + if (!fIsLast) + frame.right++; - frame.bottom++; + frame.bottom++; } + DrawBackground(fContainerView, frame, updateRect, fIsFirst, fIsLast, fIsFront); + if (fIsFront) { - frame.top += 3.0f; - if (!fIsFirst) - frame.left++; - if (!fIsLast) - frame.right--; + frame.top += 3.0f; + if (!fIsFirst) + frame.left++; + if (!fIsLast) + frame.right--; } else frame.top += 6.0f; + float spacing = be_control_look->DefaultLabelSpacing(); frame.InsetBy(spacing, spacing / 2); DrawContents(fContainerView, frame, updateRect, fIsFirst, fIsLast, @@ -126,6 +129,7 @@ TabView::DrawBackground(BView* owner, BRect frame, const BRect& updateRect, rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR); uint32 borders = BControlLook::B_TOP_BORDER | BControlLook::B_BOTTOM_BORDER; + if (isFirst) borders |= BControlLook::B_LEFT_BORDER; if (isLast)