1 files changed, 12 insertions, 2 deletions

diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index df2aad8..027e5e9 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -234,48 +234,50 @@ KToolBar::KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock, bo
 KToolBar::KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
 #ifdef DESKTOP_VERSION
     : QToolBar( QString::fromLatin1( name ),
       parentWindow, dock, newLine,
       name ? name : "mainToolBar")
 #else
   : QPEToolBar( parentWindow,QString::fromLatin1( name ))
 
 
 #endif
 
 {
     init( readConfig, honorStyle );
 }
 
 KToolBar::~KToolBar()
 {
     inshutdownprocess = true;
      emit toolbarDestroyed();
      delete d;
 }
 
 void KToolBar::init( bool readConfig, bool honorStyle )
 {
+    sizeHintW = 240;
+    sizeHintH = 22;
     inshutdownprocess = false;
     d = new KToolBarPrivate;
     setFullSize( TRUE );
     d->m_honorStyle = honorStyle;
     context = 0;
     layoutTimer = new QTimer( this );
     connect( layoutTimer, SIGNAL( timeout() ),
              this, SLOT( rebuildLayout() ) );
     connect( &(d->repaintTimer), SIGNAL( timeout() ),
              this, SLOT( slotRepaint() ) );
 /*US
     if ( kapp ) { // may be null when started inside designer
         connect(kapp, SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(slotAppearanceChanged()));
         // request notification of changes in icon style
         kapp->addKipcEventMask(KIPC::IconChanged);
         connect(kapp, SIGNAL(iconChanged(int)), this, SLOT(slotIconChanged(int)));
     }
 */
     // finally, read in our configurable settings
     if ( readConfig )
         slotReadConfig();
 
     if ( mainWindow() )
         connect( mainWindow(), SIGNAL( toolBarPositionChanged( QToolBar * ) ),
@@ -1418,50 +1420,58 @@ void KToolBar::repaintMe()
     qDebug(" KToolBar::repaintMe() ");
 }
 
 void KToolBar::showEvent( QShowEvent *e )
 {
     rebuildLayout();
     QToolBar::showEvent( e );
 }
 
 void KToolBar::setStretchableWidget( QWidget *w )
 {
     QToolBar::setStretchableWidget( w );
     stretchableWidget = w;
 }
 
 QSizePolicy KToolBar::sizePolicy() const
 {
     if ( orientation() == Horizontal )
         return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
     else
         return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding );
 }
 
 QSize KToolBar::sizeHint() const
-{
-    return QToolBar::sizeHint();
+{  
+    QSize sh = QToolBar::sizeHint();
+    //qDebug("%x KToolBar::sizeHint() %d %d ",this, QToolBar::sizeHint().width(),QToolBar::sizeHint().height() );
+    if ( sh.height() <= 20 || sh.width() < 60 )
+        return QSize(  sizeHintW, sizeHintH );
+    KToolBar* ttt =  (KToolBar*) this;
+    ttt->sizeHintW = sh.width();
+    ttt->sizeHintH = sh.height();
+    return sh;
+    //return QToolBar::sizeHint();
 #if 0
     QWidget::polish();
     static int iii = 0;
     ++iii;
     qDebug("++++++++ KToolBar::sizeHint() %d ", iii );
     int margin = static_cast<QWidget*>(ncThis)->layout()->margin();
     switch( barPos() )
     {
      case KToolBar::Top:
      case KToolBar::Bottom:
        for ( QWidget *w = widgets.first(); w; w =widgets.next() )
        {
           if ( w->inherits( "KToolBarSeparator" ) &&
              !( static_cast<KToolBarSeparator*>(w)->showLine() ) )
           {
              minSize += QSize(6, 0);
           }
           else
           {
              QSize sh = w->sizeHint();
              if (!sh.isValid())
                 sh = w->minimumSize();
              minSize = minSize.expandedTo(QSize(0, sh.height()));
              minSize += QSize(sh.width()+1, 0);