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

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/runtime/kstyles/oxygen
From:       Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date:       2010-03-29 17:17:44
Message-ID: 20100329171744.0791BAC887 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1108721 by hpereiradacosta:

Backport r1108717
Added explicit painting of toolbar background in non-detached mode, when one of the parent has 
autofillBackground set to true.



 M  +12 -3     oxygen.cpp  


--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/oxygen.cpp #1108720:1108721
@@ -6148,9 +6148,6 @@
             case QEvent::Paint:
             {
 
-                // default painting when not floating
-                if( !t->isFloating() ) return false;
-
                 QPainter p(t);
                 QPaintEvent *e = (QPaintEvent*)ev;
                 p.setClipRegion(e->region());
@@ -6158,6 +6155,18 @@
                 QRect r = t->rect();
                 QColor color = t->palette().window().color();
 
+                // default painting when not floating
+                if( !t->isFloating() ) {
+
+                    // background has to be rendered explicitely
+                    // when one of the parent has autofillBackground set to true
+                    if( checkAutoFillBackground(t) )
+                    { _helper.renderWindowBackground(&p, r, t, color); }
+
+                    return false;
+
+                }
+
                 if( compositingActive() )
                 {
                     p.setCompositionMode(QPainter::CompositionMode_Source );
[prev in list] [next in list] [prev in thread] [next in thread]