summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2008-11-24 07:50:32 +0100
committerDanny Baumann <dannybaumann@web.de>2008-11-24 07:50:32 +0100
commite148aef2d580105405356e93ca2e770ba2518a1a (patch)
tree8bf8b8a6ba2dc5ce0adb96dec5f8b0877ec063cf
parent2577b7336bb22d71911f972ea014447f9b1ebbe4 (diff)
downloadresizeinfo-compiz-0.8.tar.gz
resizeinfo-compiz-0.8.tar.bz2
Improve fade handling if a window is grabbed/ungrabbed during fade.compiz-0.8
-rw-r--r--resizeinfo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/resizeinfo.c b/resizeinfo.c
index bfde570..08c4e3a 100644
--- a/resizeinfo.c
+++ b/resizeinfo.c
@@ -392,7 +392,7 @@ infoWindowGrabNotify (CompWindow *w,
INFO_SCREEN (s);
- if (!is->pWindow && !(w->state & MAXIMIZE_STATE))
+ if ((!is->pWindow || !is->drawing) && !(w->state & MAXIMIZE_STATE))
{
Bool showInfo;
showInfo = ((w->sizeHints.width_inc != 1) &&
@@ -403,7 +403,7 @@ infoWindowGrabNotify (CompWindow *w,
{
is->pWindow = w;
is->drawing = TRUE;
- is->fadeTime = resizeinfoGetFadeTime (s->display);
+ is->fadeTime = resizeinfoGetFadeTime (s->display) - is->fadeTime;
is->resizeGeometry.x = w->attrib.x;
is->resizeGeometry.y = w->attrib.y;
@@ -427,7 +427,7 @@ infoWindowUngrabNotify (CompWindow *w)
if (w == is->pWindow)
{
is->drawing = FALSE;
- is->fadeTime = resizeinfoGetFadeTime (s->display);
+ is->fadeTime = resizeinfoGetFadeTime (s->display) - is->fadeTime;
damageScreen (s);
}