Refactoring panel containment. Purged ugly 'X'.

(bzr r159)

1 files changed, 26 insertions, 2 deletions

diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index b0a35614d..11235d083 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -113,15 +113,22 @@ void Panel::init()
     one->signal_activate().connect( sigc::bind<int, int>( sigc::mem_fun(*this, &Panel::bounceCall), 1, 0) );
     two->signal_activate().connect( sigc::bind<int, int>( sigc::mem_fun(*this, &Panel::bounceCall), 1, 1) );
 
-    closeButton.set_label("X");
+    //closeButton.set_label("X");
 
     topBar.pack_start(tabTitle);
 
-    topBar.pack_end(closeButton, false, false);
+    //topBar.pack_end(closeButton, false, false);
     topBar.pack_end(tabButton, false, false);
 
     pack_start( topBar, false, false );
 
+    Gtk::HBox* boxy = manage( new Gtk::HBox() );
+
+    boxy->pack_start( contents, true, true );
+    boxy->pack_start( rightBar, false, true );
+
+    pack_start( *boxy, true, true );
+
     show_all_children();
 
     bounceCall (0, panel_size);
@@ -139,6 +146,23 @@ void Panel::setOrientation( Gtk::AnchorType how )
     if ( _anchor != how )
     {
         _anchor = how;
+        switch ( _anchor )
+        {
+            case Gtk::ANCHOR_NORTH:
+            case Gtk::ANCHOR_SOUTH:
+            {
+                tabButton.reference();
+                topBar.remove(tabButton);
+                rightBar.pack_start(tabButton, false, false);
+                tabButton.unreference();
+
+                topBar.remove(tabTitle);
+            }
+            break;
+
+            default:
+                ; // nothing for now
+        }
     }
 }