From d0d510a7d1e22662b66361f715c571f01025e5e8 Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Thu, 6 Jan 2011 23:35:04 +0000 Subject: [PATCH] Fix BTabView bug which caused {Min,Max,Preferred}Size() to be at least 3 pixels too tall, depending on the border in use. Also a very small style fix. This fixes ticket #6544. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40138 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/TabView.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/kits/interface/TabView.cpp b/src/kits/interface/TabView.cpp index 6ba603f6f6..9f67fcb134 100644 --- a/src/kits/interface/TabView.cpp +++ b/src/kits/interface/TabView.cpp @@ -1111,7 +1111,7 @@ BTabView::MinSize() size = _TabsMinSize(); BSize containerSize = fContainerView->MinSize(); containerSize.width += 2 * _BorderWidth(); - containerSize.height += _BorderWidth(); + containerSize.height += 2 * _BorderWidth(); if (containerSize.width > size.width) size.width = containerSize.width; size.height += containerSize.height; @@ -1130,7 +1130,7 @@ BTabView::MaxSize() size = _TabsMinSize(); BSize containerSize = fContainerView->MaxSize(); containerSize.width += 2 * _BorderWidth(); - containerSize.height += _BorderWidth(); + containerSize.height += 2 * _BorderWidth(); if (containerSize.width > size.width) size.width = containerSize.width; size.height += containerSize.height; @@ -1149,7 +1149,7 @@ BTabView::PreferredSize() size = _TabsMinSize(); BSize containerSize = fContainerView->PreferredSize(); containerSize.width += 2 * _BorderWidth(); - containerSize.height += _BorderWidth(); + containerSize.height += 2 * _BorderWidth(); if (containerSize.width > size.width) size.width = containerSize.width; size.height += containerSize.height; @@ -1184,8 +1184,7 @@ BTabView::ResolveSpecifier(BMessage *message, int32 index, if (propInfo.FindMatch(message, 0, specifier, what, property) >= B_OK) return this; - return BView::ResolveSpecifier(message, index, specifier, what, - property); + return BView::ResolveSpecifier(message, index, specifier, what, property); } @@ -1409,7 +1408,7 @@ BTabView::_InitContainerView(bool layouted) BSize BTabView::_TabsMinSize() const { - BSize size(0.0f, TabHeight() + 6.0f); + BSize size(0.0f, TabHeight()); int32 count = min_c(2, CountTabs()); for (int32 i = 0; i < count; i++) { BRect frame = TabFrame(i);