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

List:       kde-commits
Subject:    kdebase/kicker/applets/devices
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2003-08-27 10:09:24
[Download RAW message or body]

CVS commit by aseigo: 

background pixmap fixes


  M +13 -13    devicebutton.cpp   1.2
  M +1 -0      devicebutton.h   1.2
  M +3 -1      devicesapplet.cpp   1.2


--- kdebase/kicker/applets/devices/devicebutton.cpp  #1.1:1.2
@@ -39,4 +39,6 @@ DeviceButton::DeviceButton(QWidget *pare
         : QButton(parent), mFileItem(fileItem)
 {
+        if (parent && !parent->parent())
+                setBackgroundMode(X11ParentRelative);
         setBackgroundOrigin(AncestorOrigin);
         setMouseTracking(true);
@@ -59,12 +61,4 @@ DeviceButton::DeviceButton(QWidget *pare
         refreshIcon();
 
-        QBrush bgbrush( colorGroup().brush(QColorGroup::Background ) );
-
-        if( bgbrush.pixmap() )
-        {
-                setBackgroundOrigin( AncestorOrigin );
-                setPaletteBackgroundPixmap( *bgbrush.pixmap() );
-        }
-
         resize(20, 20);
 
@@ -126,4 +120,10 @@ void DeviceButton::slotIconChanged(int)
 }
        
+void DeviceButton::paintEvent(QPaintEvent*)
+{
+        QPainter p( this );
+        drawButton( &p );
+}
+
 void DeviceButton::drawButton(QPainter *p)
 {
@@ -148,5 +148,5 @@ void DeviceButton::drawButtonLabel(QPain
 }
    
-void DeviceButton::enterEvent(QEvent*e)
+void DeviceButton::enterEvent(QEvent* /*e*/)
 {
         mHighlight = true;
@@ -154,5 +154,5 @@ void DeviceButton::enterEvent(QEvent*e)
 }
 
-void DeviceButton::leaveEvent(QEvent*e)
+void DeviceButton::leaveEvent(QEvent* /*e*/)
 {
         mHighlight = false;
@@ -160,10 +160,10 @@ void DeviceButton::leaveEvent(QEvent*e)
 }
 
-void DeviceButton::resizeEvent(QResizeEvent *e)
+void DeviceButton::resizeEvent(QResizeEvent * /*e*/)
 {
         refreshIcon();
 }
 
-void DeviceButton::mousePressEvent(QMouseEvent *e)
+void DeviceButton::mousePressEvent(QMouseEvent * e)
 {
         if(e->button()==RightButton)

--- kdebase/kicker/applets/devices/devicebutton.h  #1.1:1.2
@@ -39,4 +39,5 @@ public: 
 
 protected:
+        void paintEvent(QPaintEvent *);
         void refreshIcon();
         void drawButton(QPainter *p);

--- kdebase/kicker/applets/devices/devicesapplet.cpp  #1.1:1.2
@@ -42,5 +42,7 @@ DevicesApplet::DevicesApplet(const QStri
         : KPanelApplet(configFile, type, actions, parent, name)
 {
+        if (!parent)
         setBackgroundMode(X11ParentRelative);
+
         loadConfig();
         mButtonList.setAutoDelete(true);


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