From df712a4802615bfdfab57e53b718b18ea9250be0 Mon Sep 17 00:00:00 2001
From: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
Date: Fri, 30 Apr 2010 23:06:02 +0000
Subject: [PATCH] reverting r1121187 on developpers request. CCBUG: 235821

svn path=/trunk/KDE/kdebase/workspace/; revision=1121252
---
 scene.cpp | 12 ++----------
 scene.h   |  2 --
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/scene.cpp b/scene.cpp
index 32436c6d47..b6d101ee18 100644
--- a/scene.cpp
+++ b/scene.cpp
@@ -186,7 +186,7 @@ void Scene::paintGenericScreen( int orig_mask, ScreenPaintData )
     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 @@ void Scene::paintSimpleScreen( int orig_mask, QRegion region )
         {
         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 @@ bool Scene::Window::isOpaque() const
     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;
diff --git a/scene.h b/scene.h
index 94d5828aaf..0235523817 100644
--- a/scene.h
+++ b/scene.h
@@ -186,8 +186,6 @@ class Scene::Window
         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;