nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dont make two animations conflict

Browse source
This commit is contained in:
Dana Jansens 2007-05-05 13:12:04 +00:00
parent 492b66ea14
commit 9ee9b70757
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
openbox/frame.c
View file

@ -601,7 +601,8 @@ void frame_release_client(ObFrame *self, ObClient *client)
g_assert(self->client == client); g_assert(self->client == client);
/* if there was any animation going on, kill it */ /* if there was any animation going on, kill it */
ob_main_loop_timeout_remove(ob_main_loop, frame_animate_iconify); ob_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify,
self, FALSE);
/* check if the app has already reparented its window away */ /* check if the app has already reparented its window away */
while (XCheckTypedWindowEvent(ob_display, client->window, while (XCheckTypedWindowEvent(ob_display, client->window,
@ -1120,7 +1121,8 @@ void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying,
if (self->iconify_animation_step == FRAME_ANIMATE_ICONIFY_STEPS || if (self->iconify_animation_step == FRAME_ANIMATE_ICONIFY_STEPS ||
self->iconify_animation_step == -FRAME_ANIMATE_ICONIFY_STEPS) self->iconify_animation_step == -FRAME_ANIMATE_ICONIFY_STEPS)
{ {
ob_main_loop_timeout_remove(ob_main_loop, frame_animate_iconify); ob_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify,
self, FALSE);
ob_main_loop_timeout_add(ob_main_loop, ob_main_loop_timeout_add(ob_main_loop,
FRAME_ANIMATE_ICONIFY_TIME / FRAME_ANIMATE_ICONIFY_TIME /
FRAME_ANIMATE_ICONIFY_STEPS, FRAME_ANIMATE_ICONIFY_STEPS,