summaryrefslogtreecommitdiff
path: root/src/mtexturepixmapitem_glx.cpp
diff options
context:
space:
mode:
authorAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-08-12 20:53:54 +0300
committerAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-08-12 20:53:54 +0300
commit8a14b80d9984ed0e4b36280295602fa6b4023f8d (patch)
tree0f77e770e3c9ca9c1a733880d552470fc4e2c9cd /src/mtexturepixmapitem_glx.cpp
parentb5a3f7bc6734420fe926d4dfd66b9d7e923984c7 (diff)
Fixes: NB#181749 - Window animations feel 'cheap' compared to Fremantle
Details: - Added MapRequesterPrivate class to properly synchronize mapping windows only after compositing is enabled since enableCompositing() is asynchrounous. Without this, artifacts may be quite visible when mapping windows and compositing effects are required but compositing is not yet enabled. - Don't delete the object when a window is destoyed if it is animating - Delay sending of WM_DELETE only when a window has finished animating during close window effects - Wrap the MWindowProperty cache in a QPointer so the the MCompositeWindow can know if the property cache has been deleted or not. - Implemented additional background dimming effects when mapping windows as dictated by Harmattan Motion Design Guidelines. RevBy: TrustMe
Diffstat (limited to 'src/mtexturepixmapitem_glx.cpp')
-rw-r--r--src/mtexturepixmapitem_glx.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mtexturepixmapitem_glx.cpp b/src/mtexturepixmapitem_glx.cpp
index f2b3e94..cfbd09a 100644
--- a/src/mtexturepixmapitem_glx.cpp
+++ b/src/mtexturepixmapitem_glx.cpp
@@ -313,7 +313,7 @@ void MTexturePixmapItem::paint(QPainter *painter,
#endif
glEnable(GL_TEXTURE_2D);
- if (propertyCache()->hasAlpha() || opacity() < 1.0f) {
+ if (propertyCache()->hasAlpha() || (opacity() < 1.0f && !dimmedEffect()) ) {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(1.0, 1.0, 1.0, opacity());