3 files changed, 18 insertions, 4 deletions

diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index f36c5ae..d7c12bb 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -38,39 +38,41 @@ int KApplication::execDialog( QDialog* d )
 {
     if (QApplication::desktop()->width() <= 640 )    
         d->showMaximized();
     else
         ;//d->resize( 800, 600 );
     return d->exec();
 }
 void KApplication::showLicence()
 {
    KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/licence.txt" );
 }
 
 void KApplication::testCoords( int* x, int* y, int* wid, int * hei )
 {
     int dWid = QApplication::desktop()->width() ;
     int dHei = QApplication::desktop()->height();
+    if ( *x < 0 ) *x = 0;
+    if (  *y <  20 ) *y =  20 ;
     if ( *x + *wid > dWid ) {
         *x = 0;
         if ( *wid > dWid )
             *wid = dWid; 
     }
     if ( *y + *hei > dHei ) {
-        *y = 0;
+        *y = 20;
         if ( *hei > dHei )
             *hei = dHei; 
     }
 }
 void KApplication::showFile(QString caption, QString fn)
 {
     QString text;
     QString fileName;
 #ifndef DESKTOP_VERSION
    fileName = getenv("QPEDIR");
    fileName += "/pics/" + fn ;
 #else
    fileName  = qApp->applicationDirPath () + "/" + fn;
 #endif 
     QFile file( fileName );
     if (!file.open( IO_ReadOnly ) ) {
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
@@ -242,32 +242,34 @@ KToolBar::KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine, cons
 
 #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)));
@@ -1426,34 +1428,42 @@ void KToolBar::showEvent( QShowEvent *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);
diff --git a/microkde/kdeui/ktoolbar.h b/microkde/kdeui/ktoolbar.h
index 7a5c114..3319fa8 100644
--- a/microkde/kdeui/ktoolbar.h
+++ b/microkde/kdeui/ktoolbar.h
@@ -1068,33 +1068,35 @@ protected:
     void childEvent( QChildEvent *e );
     void showEvent( QShowEvent *e );
     void resizeEvent( QResizeEvent *e );
     bool event( QEvent *e );
     void applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal = false);
     QString settingsGroup();
 
 private slots:
     void rebuildLayout();
     void slotReadConfig ();
     void slotAppearanceChanged();
     void slotIconChanged(int);
     void toolBarPosChanged( QToolBar *tb );
     void slotContextAboutToShow();
     void widgetDestroyed();
 
-private:
+private: 
+    int sizeHintW;
+    int sizeHintH;
     void init( bool readConfig = true, bool honorStyle = false );
     void doConnections( KToolBarButton *button );
     void insertWidgetInternal( QWidget *w, int &index, int id );
     void removeWidgetInternal( QWidget *w );
     void getAttributes( QString &position, QString &icontext, int &index );
 //US    KPopupMenu *contextMenu();
     QPopupMenu *contextMenu();
 
     QMap<QWidget*, int > widget2id;
     typedef QMap<int, QWidget* > Id2WidgetMap;
     Id2WidgetMap id2widget;
 //US    KPopupMenu *context;
     QPopupMenu *context;
     QPtrList<QWidget> widgets;
     QTimer *layoutTimer;
     QGuardedPtr<QWidget> stretchableWidget, rightAligned;