Ticket #3161: tabview.diff

src/kits/interface/TabView.cpp

@@ -10 +10 @@
 
 #include <string.h>
 
+#include <LayoutUtils.h>
 #include <List.h>
 #include <Message.h>
 #include <PropertyInfo.h>
@@ -131 +132 @@
     if (!owner || !View() || !owner->Window())
         return;
 
+    BRect viewBounds(fView->Bounds());
+    BRect ownerBounds(owner->Bounds());
     owner->AddChild(fView);
+    if (viewBounds.Width() == 0 && viewBounds.Height() == 0
+        && ownerBounds.Width() > 0 && ownerBounds.Height() > 0) {
+        fView->ResizeTo(ownerBounds.Width(), ownerBounds.Height());
+    }
     //fView->Show();
 
     fSelected = true;
@@ -913 +920 @@
 void
 BTabView::GetPreferredSize(float *width, float *height)
 {
-    BView::GetPreferredSize(width, height);
+    BSize size = PreferredSize();
+    if (width) {
+        *width = size.width;
+    }
+    
+    if (height) {
+        *height = size.height;
+    }
 }
 
 
 void
 BTabView::ResizeToPreferred()
 {
-    BView::ResizeToPreferred();
+    BSize size = PreferredSize();
+    ResizeTo(size.width, size.height);
 }
 
 
+BSize
+BTabView::MinSize()
+{
+    BSize size;
+    
+    if (CountTabs())
+        size = TabAt(0)->View()->MinSize();
+    
+    size.height += TabHeight() + 6.0f;
+    size.width += 6.0f;
+    
+    return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
+}
+
+
+BSize
+BTabView::MaxSize()
+{
+    return BLayoutUtils::ComposeSize(ExplicitMaxSize(),
+            BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
+}
+
+
+BSize
+BTabView::PreferredSize()
+{
+    BSize size;
+    
+    if (CountTabs())
+        size = TabAt(0)->View()->PreferredSize();
+    
+    size.height += TabHeight() + 6.0f;
+    size.width += 6.0f;
+    
+    return BLayoutUtils::ComposeSize(ExplicitPreferredSize(), size);
+}
+
+
 BHandler *
 BTabView::ResolveSpecifier(BMessage *message, int32 index,
     BMessage *specifier, int32 what, const char *property)

headers/os/interface/TabView.h

@@ -150 +150 @@
 virtual void            SetFlags(uint32 flags);
 virtual void            SetResizingMode(uint32 mode);
 
-virtual void            GetPreferredSize(float *width, float *height);
-virtual void            ResizeToPreferred();
-
+virtual void            ResizeToPreferred();
+virtual void            GetPreferredSize(float* width, float* height);
+    
+virtual BSize           MinSize();
+virtual BSize           MaxSize();
+virtual BSize           PreferredSize();
+    
 virtual BHandler        *ResolveSpecifier(BMessage *message, int32 index,
                             BMessage *specifier, int32 what, const char *property);
 virtual status_t        GetSupportedSuites(BMessage *message);