fix

4 files changed, 21 insertions, 3 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 4e2523e..033e537 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -850,4 +850,7 @@ void KABCore::resizeEvent(QResizeEvent* e )
 {
-    if ( !mMiniSplitter )
+    if ( !mMiniSplitter ) {
+        QWidget::resizeEvent( e );
         return;
+    }
+#ifndef DESKTOP_VERSION
     static int desktop_width = 0;
@@ -898,2 +901,3 @@ void KABCore::resizeEvent(QResizeEvent* e )
     desktop_width = QApplication::desktop()->width();
+#endif
     QWidget::resizeEvent( e );
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index f36c5ae..d7c12bb 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -53,2 +53,4 @@ void KApplication::testCoords( int* x, int* y, int* wid, int * hei )
     int dHei = QApplication::desktop()->height();
+    if ( *x < 0 ) *x = 0;
+    if (  *y <  20 ) *y =  20 ;
     if ( *x + *wid > dWid ) {
@@ -59,3 +61,3 @@ void KApplication::testCoords( int* x, int* y, int* wid, int * hei )
     if ( *y + *hei > dHei ) {
-        *y = 0;
+        *y = 20;
         if ( *hei > dHei )
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
@@ -257,2 +257,4 @@ void KToolBar::init( bool readConfig, bool honorStyle )
 {
+    sizeHintW = 240;
+    sizeHintH = 22;
     inshutdownprocess = false;
@@ -1442,3 +1444,11 @@ 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
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
@@ -1084,2 +1084,4 @@ private slots:
 private:
+    int sizeHintW;
+    int sizeHintH;
     void init( bool readConfig = true, bool honorStyle = false );