summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2001-08-06 08:03:48 +0000
committerrhp <rhp>2001-08-06 08:03:48 +0000
commit8c7b04edb90c0b1e5b7aef73e1aab7e4d3c777f2 (patch)
treeac0f2ec0a09c36d0a25de35cecc6c696b2599f92
parent11b14d327f72a941c8a6db31077ad41b86c2cf80 (diff)
downloadmetacity-8c7b04edb90c0b1e5b7aef73e1aab7e4d3c777f2.tar.gz
Get start time after we do the pixbuf from drawable, so we don't count
2001-08-06 Havoc Pennington <hp@pobox.com> * src/effects.c (meta_effects_draw_box_animation): Get start time after we do the pixbuf from drawable, so we don't count time spent getting pixbuf from drawable in the animation time.
-rw-r--r--ChangeLog6
-rw-r--r--src/effects.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 98bdc16b..59dd54b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2001-08-06 Havoc Pennington <hp@pobox.com>
+ * src/effects.c (meta_effects_draw_box_animation): Get start
+ time after we do the pixbuf from drawable, so we don't count
+ time spent getting pixbuf from drawable in the animation time.
+
+2001-08-06 Havoc Pennington <hp@pobox.com>
+
* src/effects.c: add opaque minimize/shade feature. The wireframe
seemed kind of confusing and unclear from a UI standpoint.
I know, I know. The bloat begins here.
diff --git a/src/effects.c b/src/effects.c
index bc9f7606..99d053ed 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -186,7 +186,6 @@ meta_effects_draw_box_animation (MetaScreen *screen,
context->screen = screen;
context->millisecs_duration = seconds_duration * 1000.0;
- g_get_current_time (&context->start_time);
context->first_time = TRUE;
context->start_rect = *initial_rect;
context->end_rect = *destination_rect;
@@ -237,6 +236,11 @@ meta_effects_draw_box_animation (MetaScreen *screen,
/* Grab the X server to avoid screen dirt */
meta_display_grab (context->screen->display);
}
+
+ /* Do this only after we get the pixbuf from the server,
+ * so that the animation doesn't get truncated.
+ */
+ g_get_current_time (&context->start_time);
/* Add the timeout - a short one, could even use an idle,
* but this is maybe more CPU-friendly.