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

List:       kde-commits
Subject:    branches/work/kde4/kdebase/kicker/kicker/core
From:       Maks Orlovich <maksim () kde ! org>
Date:       2005-07-01 18:46:38
Message-ID: 1120243598.740988.9696.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 430546 by orlovich:

Make the applet handles paint. QPushButton::pixmap always returns 0, so keep track of the 
pixmap ourselves. With this, and some uncomitted hacks, kicker "starts" -- but it's far
from working


 M  +15 -3     applethandle.cpp  
 M  +4 -0      applethandle.h  


--- branches/work/kde4/kdebase/kicker/kicker/core/applethandle.cpp #430545:430546
@@ -295,6 +295,8 @@
    return pm;
 }
 
+
+
 AppletHandleDrag::AppletHandleDrag( AppletHandle* parent, const char* name)
     : QWidget( parent, name )
     , _parent( parent )
@@ -423,6 +425,16 @@
     return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
 }
 
+void AppletHandleButton::setPixmap(const QPixmap& pixmap)
+{
+    m_pixmap = pixmap;
+}
+
+QPixmap& AppletHandleButton::pixmap()
+{
+    return m_pixmap;
+}
+
 void AppletHandleButton::paintEvent( QPaintEvent* )
 {
     QPainter p(this);
@@ -484,9 +496,9 @@
         h -= 2;
     }
 
-    p.drawPixmap((w - pixmap()->width()) / 2,
-                  (h - pixmap()->height()) / 2,
-                  *pixmap());
+    p.drawPixmap((w - pixmap().width()) / 2,
+                  (h - pixmap().height()) / 2,
+                  pixmap());
 
     --w;
     --h;
--- branches/work/kde4/kdebase/kicker/kicker/core/applethandle.h #430545:430546
@@ -114,12 +114,16 @@
   Qt::Orientation orientation() const { return _parent->orientation(); }
   KPanelApplet::Direction popupDirection() const { return _parent->popupDirection(); }
 
+  void     setPixmap(const QPixmap& pixmap);
+  QPixmap& pixmap();
 protected:
   virtual void paintEvent( QPaintEvent * );
   virtual void enterEvent( QEvent * );
   virtual void leaveEvent( QEvent * );
 
 private:
+  QPixmap m_pixmap;
+
   AppletHandle* _parent;
   bool moveMouse;
 };
[prev in list] [next in list] [prev in thread] [next in thread]