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

List:       kde-commits
Subject:    kdebase/kicker/applets/clock
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2004-10-20 6:53:51
Message-ID: 20041020065351.2513516BE6 () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

BUG:76330
make sure that background changes get propagated properly


  M +11 -7     clock.cpp   1.183


--- kdebase/kicker/applets/clock/clock.cpp  #1.182:1.183
@@ -1128,6 +1128,6 @@ void ClockApplet::setBackground()
     // let's propagate the background brush too
     if ((!_clock->widget()->paletteBackgroundPixmap() &&
-        _clock->widget()->paletteBackgroundColor() == paletteBackgroundColor())
-        || paletteBackgroundPixmap())
+        _clock->widget()->paletteBackgroundColor() == paletteBackgroundColor()) ||
+        paletteBackgroundPixmap())
     {
         _clock->widget()->setBackgroundOrigin(AncestorOrigin);
@@ -1139,5 +1139,5 @@ void ClockApplet::setBackground()
             _clock->widget()->setPaletteBackgroundPixmap(*brush);
 
-            if (_date && _date->palette().active().background() == \
palette().active().background()) +            if (_date)
             {
                 _date->setBackgroundOrigin(AncestorOrigin);
@@ -1145,5 +1145,5 @@ void ClockApplet::setBackground()
             }
 
-            if (_dayOfWeek && _dayOfWeek->palette().active().background() == \
palette().active().background()) +            if (_dayOfWeek)
             {
                 _dayOfWeek->setBackgroundOrigin(AncestorOrigin);
@@ -1153,8 +1153,12 @@ void ClockApplet::setBackground()
     }
    
-    if (toreset) {
+    if (toreset)
+    {
+        _clock->widget()->setBackgroundColor(paletteBackgroundColor());
         _clock->widget()->setPaletteBackgroundPixmap(QPixmap());
         _date->setPaletteBackgroundPixmap(QPixmap());
+        _date->setBackgroundColor(paletteBackgroundColor());
         _dayOfWeek->setPaletteBackgroundPixmap(QPixmap());
+        _dayOfWeek->setBackgroundColor(paletteBackgroundColor());
     }
 


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