1 files changed, 7 insertions, 1 deletions

diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index 6ef4034..aaf14ce 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -46,49 +46,49 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
         Config config( "qpe" );
         config.setGroup( "Appearance" );
         tabBarStyle = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab );
         if ( tabBarStyle <= Global || tabBarStyle > IconList)
         {
             tabBarStyle = IconTab;
         }
         QString pos = config.readEntry( "TabPosition", "Top");
         if ( pos == "Bottom" )
         {
             tabBarPosition = Bottom;
         }
         else
         {
             tabBarPosition = Top;
         }
     }
     else
     {
         tabBarStyle = s;
         tabBarPosition = p;
     }
 
     widgetStack = new QWidgetStack( this, "widgetstack" );
-    widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised );
+    widgetStack->setFrameStyle( QFrame::NoFrame );
     widgetStack->setLineWidth( style().defaultFrameWidth() );
 
     tabBarStack = new QWidgetStack( this, "tabbarstack" );
 
     tabBar = new OTabBar( tabBarStack, "tabbar" );
     tabBarStack->addWidget( tabBar, 0 );
     connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) );
 
     tabList = new QComboBox( false, tabBarStack, "tablist" );
     tabBarStack->addWidget( tabList, 1 );
     connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) );
 
     if ( tabBarStyle == TextTab || tabBarStyle == IconTab )
     {
         tabBarStack->raiseWidget( tabBar );
     }
     else if ( tabBarStyle == TextList || tabBarStyle == IconList )
     {
         tabBarStack->raiseWidget( tabList );
     }
 
     if ( tabBarPosition == Bottom )
     {
         tabBar->setShape( QTabBar::RoundedBelow );
@@ -111,80 +111,86 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab
     {
         tab->label = QString::null;
     }
     else
     {
         tab->label = label;
     }
     if ( tabBarStyle == IconTab || tabBarStyle == IconList)
     {
         tab->iconset = new QIconSet( iconset );
     }
     int tabid = tabBar->addTab( tab );
 
     if ( tabBarStyle == IconTab || tabBarStyle == IconList )
     {
         tabList->insertItem( iconset, label, -1 );
     }
     else
     {
         tabList->insertItem( label );
     }
 
     widgetStack->addWidget( child, tabid );
     widgetStack->raiseWidget( child );
+    widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised );
 
     OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label );
     tabs.append( tabinfo );
     selectTab( tabinfo );
 }
 
 void OTabWidget::removePage( QWidget *childwidget )
 {
         if ( childwidget )
     {
         OTabInfo *tab = tabs.first();
         while ( tab && tab->control() != childwidget )
         {
             tab = tabs.next();
         }
         if ( tab && tab->control() == childwidget )
         {
             tabBar->setTabEnabled( tab->id(), FALSE );
             tabBar->removeTab( tabBar->tab( tab->id() ) );
             int i = 0;
             while ( i < tabList->count() && tabList->text( i ) != tab->label() )
             {
                 i++;
             }
             if ( tabList->text( i ) == tab->label() )
             {
                 tabList->removeItem( i );
             }
             widgetStack->removeWidget( childwidget );
             tabs.remove( tab );
             delete tab;
             currentTab = tabs.current();
+            if ( !currentTab )
+            {
+                widgetStack->setFrameStyle( QFrame::NoFrame );
+            }
+
             setUpLayout();
         }
     }
 }
 
 void OTabWidget::setCurrentTab( QWidget *childwidget )
 {
     OTabInfo *newtab = tabs.first();
     while ( newtab && newtab->control() != childwidget )
     {
         newtab = tabs.next();
     }
     if ( newtab && newtab->control() == childwidget )
     {
         selectTab( newtab );
     }
 }
 
 void OTabWidget::setCurrentTab( const QString &tabname )
 {
     OTabInfo *newtab = tabs.first();
     while ( newtab && newtab->label() != tabname )
     {
         newtab = tabs.next();