| author | zautrix <zautrix> | 2005-10-22 14:12:43 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-10-22 14:12:43 (UTC) |
| commit | a72d70beb381b9cd6f2af301b52ca82cdcafb299 (patch) (side-by-side diff) | |
| tree | f5b068e80395821abb5717fb07757a17d805f770 /microkde | |
| parent | a72f3f3acfac791715a1c512fc4cc4c3facdbb62 (diff) | |
| download | kdepimpi-a72d70beb381b9cd6f2af301b52ca82cdcafb299.zip kdepimpi-a72d70beb381b9cd6f2af301b52ca82cdcafb299.tar.gz kdepimpi-a72d70beb381b9cd6f2af301b52ca82cdcafb299.tar.bz2 | |
fix
| -rw-r--r-- | microkde/kapplication.cpp | 4 | ||||
| -rw-r--r-- | microkde/kdeui/ktoolbar.cpp | 14 | ||||
| -rw-r--r-- | microkde/kdeui/ktoolbar.h | 4 |
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 @@ -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; @@ -1441,4 +1443,12 @@ QSizePolicy KToolBar::sizePolicy() const 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 @@ -1083,3 +1083,5 @@ private slots: -private: +private: + int sizeHintW; + int sizeHintH; void init( bool readConfig = true, bool honorStyle = false ); |