summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Sullivan <sullivan@eazel.com>2001-03-09 02:25:17 +0000
committerJohn Sullivan <sullivan@src.gnome.org>2001-03-09 02:25:17 +0000
commitd05fbebee660901db77be37995b7fa7773ac672a (patch)
treeb5291b6fe2358f3b65f85aba2d3cc1f59721455b
parent8a631f5b601e2152c2bd2f8f47e5edad4c948dd8 (diff)
downloadnautilus-d05fbebee660901db77be37995b7fa7773ac672a.tar.gz
Merge from HEAD:
2001-03-08 John Sullivan <sullivan@eazel.com> fix by: Andy Hertzfeld <andy@eazel.com> reviewed by: Darin Adler <darin@eazel.com> Fixed bug 7580 (Throbber flashing constantly when animating) * components/throbber/nautilus-throbber.c: (draw_throbber_image): Only clear the gdk window once per cycle, instead of for every frame.
-rw-r--r--ChangeLog14
-rw-r--r--components/throbber/nautilus-throbber.c8
2 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f53ec464..8e19f8a8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-03-08 John Sullivan <sullivan@eazel.com>
+
+ Merge from HEAD:
+
+ 2001-03-08 John Sullivan <sullivan@eazel.com>
+
+ fix by: Andy Hertzfeld <andy@eazel.com>
+ reviewed by: Darin Adler <darin@eazel.com>
+
+ Fixed bug 7580 (Throbber flashing constantly when animating)
+
+ * components/throbber/nautilus-throbber.c: (draw_throbber_image):
+ Only clear the gdk window once per cycle, instead of for every frame.
+
2001-03-08 Robey Pointer <robey@eazel.com>
reviewed by: Eskil Heyn Olsen <eskil@eazel.com>
diff --git a/components/throbber/nautilus-throbber.c b/components/throbber/nautilus-throbber.c
index 806ec864e..cdc636f2a 100644
--- a/components/throbber/nautilus-throbber.c
+++ b/components/throbber/nautilus-throbber.c
@@ -366,13 +366,17 @@ draw_throbber_image (GtkWidget *widget, GdkRectangle *box)
}
/* clear the entire gdk window to avoid messing up gradient themes due to bonobo bug */
+ /* only do this once per cycle to minimize flashing */
gdk_window_get_size (widget->window, &window_width, &window_height);
- gdk_window_clear_area (widget->window,
+
+ if (throbber->details->current_frame == 0) {
+ gdk_window_clear_area (widget->window,
0,
0,
window_width,
window_height);
-
+ }
+
pixbuf = select_throbber_image (throbber);
/* center the throbber image in the gdk window */