Ticket #3161: tabview_layouted.2.diff

headers/os/interface/TabView.h

@@ -106 +106 @@
 class BTabView : public BView
 {
 public:
+                        BTabView(const char *name,
+                            button_width width = B_WIDTH_AS_USUAL,
+                            uint32 flags = B_FULL_UPDATE_ON_RESIZE |
+                                 B_WILL_DRAW | B_NAVIGABLE_JUMP |
+                                 B_FRAME_EVENTS | B_NAVIGABLE);
                         BTabView(BRect frame, const char *name,
                             button_width width = B_WIDTH_AS_USUAL, 
                             uint32 resizingMode = B_FOLLOW_ALL,
                             uint32 flags = B_FULL_UPDATE_ON_RESIZE |
-                                B_WILL_DRAW | B_NAVIGABLE_JUMP |
-                                B_FRAME_EVENTS | B_NAVIGABLE);
+                                 B_WILL_DRAW | B_NAVIGABLE_JUMP |
+                                 B_FRAME_EVENTS | B_NAVIGABLE);
                         ~BTabView();
 
                         BTabView(BMessage *archive);
@@ -150 +155 @@
 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);
@@ -174 +183 @@
         BView           *ViewForTab(int32 tabIndex) const;
 
 private:
-        void            _InitObject();
+        void            _InitObject(bool layouted = false);
 
 virtual void            _ReservedTabView1();
 virtual void            _ReservedTabView2();

src/kits/interface/TabView.cpp

@@ -10 +10 @@
 
 #include <string.h>
 
+#include <CardLayout.h>
+#include <LayoutUtils.h>
 #include <List.h>
 #include <Message.h>
 #include <PropertyInfo.h>
@@ -131 +133 @@
     if (!owner || !View() || !owner->Window())
         return;
 
-    owner->AddChild(fView);
+    if (!owner->GetLayout())
+        owner->AddChild(fView);
     //fView->Show();
 
     fSelected = true;
@@ -141 +144 @@
 void
 BTab::Deselect()
 {
-    if (View())
-        View()->RemoveSelf();
-
+    if (View()) {
+        bool removeView = false;
+        BView* container = View()->Parent();
+        if (container)
+            removeView =
+                dynamic_cast<BCardLayout*>(container->GetLayout()) == NULL;
+        if (removeView)
+            View()->RemoveSelf();
+    }
+    
     fSelected = false;
 }
 
@@ -329 +339 @@
 
 //  #pragma mark -
 
+BTabView::BTabView(const char *name, button_width width, uint32 flags)
+    : BView(name, flags)
+{
+    SetFont(be_bold_font);
+    
+    _InitObject(true);
+    
+    fTabWidthSetting = width;
+}
 
+
 BTabView::BTabView(BRect frame, const char *name, button_width width, 
     uint32 resizingMode, uint32 flags)
     : BView(frame, name, resizingMode, flags)
@@ -669 +689 @@
         index = Selection();
 
     BTab *tab = TabAt(Selection());
+    
+    bool layouted = fContainerView->GetLayout() ? true : false;
+    
     if (tab)
         tab->Deselect();
 
@@ -678 +701 @@
             fTabOffset = 0.0f;
         tab->Select(ContainerView());
         fSelection = index;
+        
+        if (layouted) {
+            BCardLayout* layout =
+                dynamic_cast<BCardLayout*>(fContainerView->GetLayout());
+            if (layout)
+                layout->SetVisibleItem(index);
+        }
     }
 
     Invalidate();
@@ -917 +947 @@
 }
 
 
+BSize
+BTabView::MinSize()
+{
+    BSize size = fContainerView->MinSize();
+    size.height += TabHeight() + 6.0f;
+    size.width += 6.0f;
+    return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
+}
+
+
+BSize
+BTabView::MaxSize()
+{
+    BSize size = fContainerView->MaxSize();
+    size.height += TabHeight() + 6.0f;
+    size.width += 6.0f;
+    return BLayoutUtils::ComposeSize(ExplicitMaxSize(), size);
+}
+
+
+BSize
+BTabView::PreferredSize()
+{
+    BSize size = fContainerView->PreferredSize();
+    size.height += TabHeight() + 6.0f;
+    size.width += 6.0f;
+    return BLayoutUtils::ComposeSize(ExplicitPreferredSize(), size);
+}
+
+
 void
 BTabView::ResizeToPreferred()
 {
@@ -957 +1017 @@
         tab = new BTab(target);
     else
         tab->SetView(target);
+    
+    if (fContainerView->GetLayout())
+        fContainerView->GetLayout()->AddView(CountTabs(), target);
 
     fTabList->AddItem(tab);
 }
@@ -972 +1035 @@
     if (tab == NULL)
         return NULL;
 
+    bool layouted = fContainerView->GetLayout() ? true : false;
+    
     tab->Deselect();
 
     if (index <= fSelection && fSelection != 0)
@@ -987 +1052 @@
     else
         SetFocusTab(fFocus, true);
 
+    if (layouted)
+        fContainerView->GetLayout()->RemoveItem(index);
+    
     return tab;
 }
 
@@ -1062 +1130 @@
 
 
 void
-BTabView::_InitObject()
+BTabView::_InitObject(bool layouted)
 {
     fTabList = new BList;
 
@@ -1088 +1156 @@
     fContainerView = new BView(bounds, "view container", B_FOLLOW_ALL,
         B_WILL_DRAW);
 
+    if (layouted) {
+        BCardLayout* layout = new BCardLayout();
+        if (layout)
+            fContainerView->SetLayout(layout);
+    }
+    
     fContainerView->SetViewColor(color);
     fContainerView->SetLowColor(color);