made some throbber changes for Arlo: put the throbber into a gtk frame and

	made some throbber changes for Arlo: put the throbber into a gtk frame
	and reset the frame count each time it's started.

3 files changed, 24 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index bbdbbdf7d..bb8628742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-02  Andy Hertzfeld  <andy@eazel.com>
+
+	made some throbber changes for Arlo
+	
+	* src/nautilus-throbber.c: (bump_throbber_frame),
+	(nautilus_throbber_start):
+	reset the throbber frame each time it's restarted
+	* src/nautilus-window-toolbars.c: (allocate_throbber):
+	put the throbber into a gtk frame
+	
 2000-10-02  Michael Engber  <engber@eazel.com>
 
 	More background drawing speedups - this time mainly for
diff --git a/src/nautilus-throbber.c b/src/nautilus-throbber.c
index 461346a45..e03300caf 100644
--- a/src/nautilus-throbber.c
+++ b/src/nautilus-throbber.c
@@ -271,8 +271,8 @@ bump_throbber_frame (NautilusThrobber *throbber)
 	throbber->details->current_frame += 1;
 	if (throbber->details->current_frame > throbber->details->max_frame) {
 		throbber->details->current_frame = 0;
-	}	
-	
+	}
+
 	gtk_widget_queue_draw (GTK_WIDGET (throbber));
 	return TRUE;
 }
@@ -285,7 +285,9 @@ nautilus_throbber_start (NautilusThrobber *throbber)
 {
 	if (throbber->details->timer_task != -1)
 		gtk_timeout_remove(throbber->details->timer_task);
-
+	
+	/* reset the frame count */
+	throbber->details->current_frame = 0;
 	throbber->details->timer_task = gtk_timeout_add (THROBBER_TIMEOUT, (GtkFunction) bump_throbber_frame, throbber);
 }
 
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index 1054f639a..785bf6467 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -338,13 +338,19 @@ set_up_toolbar_images (NautilusWindow *window)
 static GtkWidget*
 allocate_throbber (GtkWidget *toolbar)
 {
-	GtkWidget *throbber;
+	GtkWidget *throbber, *frame;
 	gboolean small_mode;
 	
 	throbber = nautilus_throbber_new ();
 	gtk_widget_show (throbber);
-	gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), throbber, NULL, NULL);
-	nautilus_toolbar_set_throbber (NAUTILUS_TOOLBAR (toolbar), throbber);
+	
+	frame = gtk_frame_new (NULL);
+	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);	
+	gtk_widget_show (frame);
+	gtk_container_add (GTK_CONTAINER (frame), throbber);
+		
+	gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), frame, NULL, NULL);
+	nautilus_toolbar_set_throbber (NAUTILUS_TOOLBAR (toolbar), frame);
 	
 	small_mode = GTK_TOOLBAR (toolbar)->style != GTK_TOOLBAR_BOTH;
 	nautilus_throbber_set_small_mode (NAUTILUS_THROBBER (throbber), small_mode);