diff --git a/scene.cpp b/scene.cpp index 211002ce35..54512ac54f 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->toplevelDecorationHasAlpha())? PAINT_WINDOW_OPAQUE : PAINT_WINDOW_TRANSLUCENT ); + data.mask = orig_mask | ( (w->isOpaque() && !w->decorationHasAlpha())? 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->toplevelDecorationHasAlpha()) ? PAINT_WINDOW_OPAQUE : PAINT_WINDOW_TRANSLUCENT ); + data.mask = orig_mask | ( (w->isOpaque() && !w->decorationHasAlpha()) ? 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,7 +440,7 @@ bool Scene::Window::isOpaque() const return toplevel->opacity() == 1.0 && !toplevel->hasAlpha(); } -bool Scene::Window::toplevelDecorationHasAlpha( void ) const +bool Scene::Window::decorationHasAlpha( void ) const { if( toplevel->clientPos() == QPoint( 0, 0 ) && toplevel->clientSize() == toplevel->visibleRect().size()) return false;