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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kwin
From:       Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date:       2010-04-30 23:06:03
Message-ID: 20100430230603.11A1BAC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1121252 by hpereiradacosta:

reverting r1121187
on developpers request.
CCBUG: 235821


 M  +2 -10     scene.cpp  
 M  +0 -2      scene.h  


--- trunk/KDE/kdebase/workspace/kwin/scene.cpp #1121251:1121252
@@ -186,7 +186,7 @@
     foreach( Window* w, stacking_order ) // bottom to top
         {
         WindowPrePaintData data;
-        data.mask = orig_mask | ( (w->isOpaque() && !w->decorationHasAlpha())? \
PAINT_WINDOW_OPAQUE : PAINT_WINDOW_TRANSLUCENT ); +        data.mask = orig_mask | ( \
w->isOpaque()? PAINT_WINDOW_OPAQUE : PAINT_WINDOW_TRANSLUCENT );  \
                w->resetPaintingEnabled();
         data.paint = infiniteRegion(); // no clipping, so doesn't really matter
         data.clip = QRegion();
@@ -229,7 +229,7 @@
         {
         Window* w = stacking_order[ i ];
         WindowPrePaintData data;
-        data.mask = orig_mask | ( (w->isOpaque() && !w->decorationHasAlpha()) ? \
PAINT_WINDOW_OPAQUE : PAINT_WINDOW_TRANSLUCENT ); +        data.mask = orig_mask | ( \
w->isOpaque() ? PAINT_WINDOW_OPAQUE : PAINT_WINDOW_TRANSLUCENT );  \
w->resetPaintingEnabled();  data.paint = region;
         // Clip out the decoration for opaque windows; the decoration is drawn in \
the second pass @@ -440,14 +440,6 @@
     return toplevel->opacity() == 1.0 && !toplevel->hasAlpha();
     }
 
-bool Scene::Window::decorationHasAlpha( void ) const
-    {
-    if( toplevel->clientPos() == QPoint( 0, 0 ) && toplevel->clientSize() == \
                toplevel->visibleRect().size())
-        return false;
-
-    return Workspace::self()->decorationHasAlpha();
-    }
-
 bool Scene::Window::isPaintingEnabled() const
     {
     return !disable_painting;
--- trunk/KDE/kdebase/workspace/kwin/scene.h #1121251:1121252
@@ -186,8 +186,6 @@
         bool isVisible() const;
         // is the window fully opaque
         bool isOpaque() const;
-        // does the decoration has alpha channel
-        bool decorationHasAlpha( void ) const;
         // shape of the window
         QRegion shape() const;
         QRegion clientShape() const;


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