summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@opencompositing.org>2008-06-18 20:06:51 +0200
committerDennis kasprzyk <onestone@opencompositing.org>2008-06-18 20:06:51 +0200
commit8b8ad55fc130f0aa8357441555f1728aba60c335 (patch)
tree86cc20c0a3377143eb320edd00b864c10d7b583e
parentcf27f8f14ab8dd55907d3ead943226f38a325c46 (diff)
downloadgroup-8b8ad55fc130f0aa8357441555f1728aba60c335.tar.gz
group-8b8ad55fc130f0aa8357441555f1728aba60c335.tar.bz2
Track core changes
-rw-r--r--group.c1
-rw-r--r--init.c2
-rw-r--r--queues.c6
-rw-r--r--tab.c3
4 files changed, 7 insertions, 5 deletions
diff --git a/group.c b/group.c
index 0447fac..3a1d4e0 100644
--- a/group.c
+++ b/group.c
@@ -1648,6 +1648,7 @@ groupHandleEvent (CompDisplay *d,
if (hoverTime > 0)
gs->dragHoverTimeoutHandle =
compAddTimeout (hoverTime,
+ (float) hoverTime * 1.2,
groupDragHoverTimeout, w);
}
}
diff --git a/init.c b/init.c
index 54d6baf..9eb091c 100644
--- a/init.c
+++ b/init.c
@@ -346,7 +346,7 @@ groupInitScreen (CompPlugin *p,
/* one-shot timeout for stuff that needs to be initialized after
all screens and windows are initialized */
- compAddTimeout (0, groupApplyInitialActions, (void *) s);
+ compAddTimeout (0, 0, groupApplyInitialActions, (void *) s);
initTexture (s, &gs->glowTexture);
diff --git a/queues.c b/queues.c
index 3313a3c..4bfc2f7 100644
--- a/queues.c
+++ b/queues.c
@@ -67,7 +67,7 @@ groupEnqueueMoveNotify (CompWindow *w,
if (!gs->dequeueTimerSet)
{
- compAddTimeout (0, groupDequeueTimer, (void *) w->screen);
+ compAddTimeout (0, 0, groupDequeueTimer, (void *) w->screen);
gs->dequeueTimerSet = TRUE;
}
}
@@ -167,7 +167,7 @@ groupEnqueueGrabNotify (CompWindow *w,
if (!gs->dequeueTimerSet)
{
- compAddTimeout (0, groupDequeueTimer, (void *) w->screen);
+ compAddTimeout (0, 0, groupDequeueTimer, (void *) w->screen);
gs->dequeueTimerSet = TRUE;
}
}
@@ -223,7 +223,7 @@ groupEnqueueUngrabNotify (CompWindow *w)
if (!gs->dequeueTimerSet)
{
- compAddTimeout (0, groupDequeueTimer, (void *) w->screen);
+ compAddTimeout (0, 0, groupDequeueTimer, (void *) w->screen);
gs->dequeueTimerSet = TRUE;
}
}
diff --git a/tab.c b/tab.c
index 422e980..11e8a0f 100644
--- a/tab.c
+++ b/tab.c
@@ -743,6 +743,7 @@ groupHandleAnimation (GroupSelection *group)
group->tabBar->timeoutHandle =
compAddTimeout (groupGetVisibilityTime (s) * 1000,
+ groupGetVisibilityTime (s) * 1200,
groupTabBarTimeout, group);
}
}
@@ -1022,7 +1023,7 @@ groupUpdateTabBars (CompScreen *s,
if (gs->showDelayTimeoutHandle)
compRemoveTimeout (gs->showDelayTimeoutHandle);
gs->showDelayTimeoutHandle =
- compAddTimeout (showDelayTime,
+ compAddTimeout (showDelayTime, (float) showDelayTime * 1.2,
groupShowDelayTimeout, hoveredGroup);
}
else