From 2a84ba0094e0fb32308c1a58670f210cbdfd2639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Thu, 6 Oct 2011 22:40:26 +0200 Subject: [PATCH] don't scale highlighted window in present windows during de/activation BUG: 283481 it's even worse, since it interferes with generally upscaled windows (keeps them big, applies false transition and causes a final snapback) and windata->highlight doesn't end at zero, so the entire screen is still a little scaled when the effect ends (and snaps down afterwards) now it snaps down when starting the leave what is better in general and the only usable solution for upscaled windows. some day presentwindows might be derived from the yet-to-add animationeffect class ;-) --- effects/presentwindows/presentwindows.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp index 80c258a70b..52b713a81e 100755 --- a/effects/presentwindows/presentwindows.cpp +++ b/effects/presentwindows/presentwindows.cpp @@ -348,7 +348,7 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region m_motionManager.apply(w, data); QRect rect = m_motionManager.transformedGeometry(w).toRect(); - if (winData->highlight > 0.0) { + if (m_activated && winData->highlight > 0.0) { // scale the window (interpolated by the highlight level) to at least 105% or to cover 1/16 of the screen size - yet keep it in screen bounds QRect area = effects->clientArea(FullScreenArea, w); QSizeF effSize(w->width()*data.xScale, w->height()*data.yScale);