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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdebase/kicker/ui
From:       Frerich Raabe <raabe () kde ! org>
Date:       2004-03-29 10:47:55
Message-ID: 20040329104755.936ED9953 () office ! kde ! org
[Download RAW message or body]

CVS commit by raabe: 

- Revert hack for Qt 3.3.0 so that the K-Menu does not get wider and wider
  with Qt 3.3.1 anymore. Also fixes some other problem with the K-Menu which
  I forgot, but it was equally annoying (backport).


  M +25 -3     k_mnu.cpp   1.84.2.4
  M +4 -0      k_mnu.h   1.23.2.2


--- kdebase/kicker/ui/k_mnu.cpp  #1.84.2.3:1.84.2.4
@@ -326,6 +326,4 @@ void PanelKMenu::initialize()
 #endif
 
-    setMinimumSize( sizeHint() );
-
     setInitialized(true);
 }
@@ -404,4 +402,24 @@ void PanelKMenu::slotEditUserContact()
 }
 
+void PanelKMenu::setMinimumSize(const QSize & s)
+{
+    KPanelMenu::setMinimumSize(s.width() + sidePixmap.width(), s.height());
+}
+
+void PanelKMenu::setMaximumSize(const QSize & s)
+{
+    KPanelMenu::setMaximumSize(s.width() + sidePixmap.width(), s.height());
+}
+
+void PanelKMenu::setMinimumSize(int w, int h)
+{
+    KPanelMenu::setMinimumSize(w + sidePixmap.width(), h);
+}
+
+void PanelKMenu::setMaximumSize(int w, int h)
+{
+  KPanelMenu::setMaximumSize(w + sidePixmap.width(), h);
+}
+
 QRect PanelKMenu::sideImageRect()
 {
@@ -412,4 +430,7 @@ QRect PanelKMenu::sideImageRect()
 void PanelKMenu::resizeEvent(QResizeEvent * e)
 {
+//    kdDebug(1210) << "PanelKMenu::resizeEvent():" << endl;
+//    kdDebug(1210) << geometry().width() << ", " << geometry().height() << endl;
+
     PanelServiceMenu::resizeEvent(e);
 
@@ -421,5 +442,6 @@ QSize PanelKMenu::sizeHint() const
 {
     QSize s = PanelServiceMenu::sizeHint();
-    s.setWidth( s.width() + sidePixmap.width() );
+//    kdDebug(1210) << "PanelKMenu::sizeHint()" << endl;
+//    kdDebug(1210) << s.width() << ", " << s.height() << endl;
     return s;
 }

--- kdebase/kicker/ui/k_mnu.h  #1.23.2.1:1.23.2.2
@@ -48,4 +48,8 @@ public:
 
     virtual QSize sizeHint() const;
+    virtual void setMinimumSize(const QSize &);
+    virtual void setMaximumSize(const QSize &);
+    virtual void setMinimumSize(int, int);
+    virtual void setMaximumSize(int, int);
 
 public slots:


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