[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/kdeui
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-09-22 14:06:16
Message-ID: 20040922140616.BB44B9BAF () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Backport r1.187.


  M +11 -7     kmenubar.cpp   1.185.2.1
  M +3 -2      kmenubar.h   1.63.2.1


--- kdelibs/kdeui/kmenubar.cpp  #1.185:1.185.2.1
@@ -223,6 +223,5 @@ void KMenuBar::setTopLevelMenuInternal(b
       setMinimumSize( 0, 0 );
       setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
-      menuContentsChanged(); // trigger invalidating calculated size
-      resize( sizeHint());   // and resize to preferred size
+      updateMenuBarSize();
       if ( parentWidget() )
           reparent( parentWidget(), QPoint(0,0), !isHidden());
@@ -317,7 +316,7 @@ void KMenuBar::updateFallbackSize()
 //            KWin::setStrut( winId(), 0, 0, 0, 0 ); KWin will set strut as it will see fit
 #endif
+            setMinimumSize( 0, 0 );
             setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
-            menuContentsChanged();
-            resize( sizeHint());
+            updateMenuBarSize();
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
         }
@@ -413,5 +412,5 @@ void KMenuBar::checkSize( int& w, int& h
         --block_resize;
     }
-    // This is not done as setMinimumSize(), becase that would set the minimum
+    // This is not done as setMinimumSize(), because that would set the minimum
     // size in WM_NORMAL_HINTS, and KWin would not allow changing to smaller size
     // anymore
@@ -432,6 +431,5 @@ bool KMenuBar::x11Event( XEvent* ev )
         d->min_size = QSize( ev->xclient.data.l[ 1 ], ev->xclient.data.l[ 2 ] );
 //        kdDebug() << "MINSIZE:" << d->min_size << endl;
-        menuContentsChanged();
-        resize( sizeHint());
+        updateMenuBarSize();
         return true;
     }
@@ -440,4 +438,10 @@ bool KMenuBar::x11Event( XEvent* ev )
 }
 
+void KMenuBar::updateMenuBarSize()
+    {
+    menuContentsChanged(); // trigger invalidating calculated size
+    resize( sizeHint());   // and resize to preferred size
+    }
+
 void KMenuBar::setFrameStyle( int style )
 {

--- kdelibs/kdeui/kmenubar.h  #1.63:1.63.2.1
@@ -97,4 +97,5 @@ private slots:
 private:
     void setTopLevelMenuInternal(bool top_level);
+    void updateMenuBarSize();
     void checkSize( int& w, int& h );
     static int block_resize;


[prev in list] [next in list] [prev in thread] [next in thread]