reviewed by: Darin Adler <darin@eazel.com>

	Fixed bug 7918 (Preferences window wider than it needs to be)
	This also fixes the bug where the HTTP Host text field was
	a little shorter than the HTTP Location text field.

	* libnautilus-extensions/nautilus-caption.h:
	* libnautilus-extensions/nautilus-caption.c:
	(nautilus_caption_set_extra_spacing): Renamed from
	_set_spacing, since there's a minimum fixed amount
	of spacing that's always used. The bug was that this
	routine was (only) being used to align items by setting the
	padding of the 2nd item in the box. This sets an equal
	amount of blank space before and after the item, when
	we only want the space before. Fixed by changing it to
	use gtk_box_set_spacing instead.
	(nautilus_caption_set_child): Don't use the spacing for
	the padding here either.

	* libnautilus-extensions/nautilus-preferences-item.h:
	* libnautilus-extensions/nautilus-preferences-item.c:
	(nautilus_preferences_item_set_caption_extra_spacing):
	Renamed from _set_caption_spacing for clarity.

	* libnautilus-extensions/nautilus-preferences-group.c:
	(preferences_group_align_captions): Updated for name
	change.

11 files changed, 72 insertions, 84 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e33ef026..4e1c711ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2001-04-02  John Sullivan  <sullivan@eazel.com>
+
+	reviewed by: Darin Adler <darin@eazel.com>
+
+	Fixed bug 7918 (Preferences window wider than it needs to be)
+	This also fixes the bug where the HTTP Host text field was
+	a little shorter than the HTTP Location text field.
+
+	* libnautilus-extensions/nautilus-caption.h:
+	* libnautilus-extensions/nautilus-caption.c:
+	(nautilus_caption_set_extra_spacing): Renamed from
+	_set_spacing, since there's a minimum fixed amount
+	of spacing that's always used. The bug was that this
+	routine was (only) being used to align items by setting the 
+	padding of the 2nd item in the box. This sets an equal
+	amount of blank space before and after the item, when
+	we only want the space before. Fixed by changing it to
+	use gtk_box_set_spacing instead.
+	(nautilus_caption_set_child): Don't use the spacing for
+	the padding here either.
+	
+	* libnautilus-extensions/nautilus-preferences-item.h:
+	* libnautilus-extensions/nautilus-preferences-item.c:
+	(nautilus_preferences_item_set_caption_extra_spacing):
+	Renamed from _set_caption_spacing for clarity.
+
+	* libnautilus-extensions/nautilus-preferences-group.c:
+	(preferences_group_align_captions): Updated for name
+	change.
+
 2001-04-01  Andy Hertzfeld  <andy@eazel.com>
 
 	reviewed by: Michael Engber  <engber@eazel.com>
diff --git a/libnautilus-extensions/nautilus-caption.c b/libnautilus-extensions/nautilus-caption.c
index 1a2a6b307..141ce92ea 100644
--- a/libnautilus-extensions/nautilus-caption.c
+++ b/libnautilus-extensions/nautilus-caption.c
@@ -41,7 +41,6 @@ struct _NautilusCaptionDetail
 	GtkWidget *title_label;
 	GtkWidget *child;
 	gboolean show_title;
-	int spacing;
 };
 
 /* NautilusCaptionClass methods */
@@ -248,48 +247,27 @@ nautilus_caption_set_child (NautilusCaption *caption,
 			    caption->detail->child,
 			    expand,	/* expand */
 			    fill,	/* fill */
-			    caption->detail->spacing);	/* padding */
+			    0);	        /* padding */
 	
 	gtk_widget_show (caption->detail->child);
 }
 
 /**
- * nautilus_caption_set_spacing
+ * nautilus_caption_set_extra_spacing
  * @caption: A NautilusCaption
- * @spacing: Spacing in pixels between the title and the child.
+ * @spacing: Extra spacing in pixels between the title and the child,
+ * beyond the nominal amount
  *
- * Set the spacing between the title label and the caption's one
- * and only child.
+ * Set the amount of extra spacing between the title label and the 
+ * caption's one and only child.
  */
 void
-nautilus_caption_set_spacing (NautilusCaption *caption,
-			      int spacing)
+nautilus_caption_set_extra_spacing (NautilusCaption *caption,
+			      	    int extra_spacing)
 {
-	gboolean expand;
-	gboolean fill;
-	guint padding;
-	GtkPackType pack_type;
-
 	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-	g_return_if_fail (spacing >= 0);
-
-	caption->detail->spacing = spacing;
-	
-	if (caption->detail->child == NULL) {
-		return;
-	}
+	g_return_if_fail (extra_spacing >= 0);
 
-	gtk_box_query_child_packing (GTK_BOX (caption),
-				     caption->detail->child,
-				     &expand,
-				     &fill,
-				     &padding,
-				     &pack_type);
-	
-	gtk_box_set_child_packing (GTK_BOX (caption),
-				   caption->detail->child,
-				   expand,
-				   fill,
-				   caption->detail->spacing,
-				   pack_type);
+	gtk_box_set_spacing (GTK_BOX (caption), 
+			     CAPTION_SPACING + extra_spacing);
 }
diff --git a/libnautilus-extensions/nautilus-caption.h b/libnautilus-extensions/nautilus-caption.h
index 56d0e5e46..c30a896db 100644
--- a/libnautilus-extensions/nautilus-caption.h
+++ b/libnautilus-extensions/nautilus-caption.h
@@ -80,8 +80,8 @@ void       nautilus_caption_set_child             (NautilusCaption       *captio
 						   GtkWidget             *child,
 						   gboolean               expand,
 						   gboolean               fill);
-void       nautilus_caption_set_spacing           (NautilusCaption       *caption,
-						   int                    spacing);
+void       nautilus_caption_set_extra_spacing     (NautilusCaption       *caption,
+						   int                    extra_spacing);
 int        nautilus_caption_get_title_label_width (const NautilusCaption *caption);
 
 END_GNOME_DECLS
diff --git a/libnautilus-extensions/nautilus-preferences-group.c b/libnautilus-extensions/nautilus-preferences-group.c
index 59c51bd5d..46ebf9474 100644
--- a/libnautilus-extensions/nautilus-preferences-group.c
+++ b/libnautilus-extensions/nautilus-preferences-group.c
@@ -215,7 +215,7 @@ preferences_group_align_captions (NautilusPreferencesGroup *group)
 
 			g_assert (width <= max_title_width);
 			
-			nautilus_preferences_item_set_caption_spacing (item, max_title_width - width);
+			nautilus_preferences_item_set_caption_extra_spacing (item, max_title_width - width);
 		}
 	}
 }
diff --git a/libnautilus-extensions/nautilus-preferences-item.c b/libnautilus-extensions/nautilus-preferences-item.c
index fdca87ae7..acfa2784a 100644
--- a/libnautilus-extensions/nautilus-preferences-item.c
+++ b/libnautilus-extensions/nautilus-preferences-item.c
@@ -1076,17 +1076,18 @@ nautilus_preferences_item_get_caption_title_label_width (const NautilusPreferenc
 }
 
 void
-nautilus_preferences_item_set_caption_spacing (NautilusPreferencesItem *item,
-					       int spacing)
+nautilus_preferences_item_set_caption_extra_spacing (NautilusPreferencesItem *item,
+					             int extra_spacing)
 {
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (spacing >= 0);
+	g_return_if_fail (extra_spacing >= 0);
 
 	if (!nautilus_preferences_item_child_is_caption (item)) {
 		return;
 	}
 
-	return nautilus_caption_set_spacing (NAUTILUS_CAPTION (item->details->child), spacing);
+	nautilus_caption_set_extra_spacing (NAUTILUS_CAPTION (item->details->child), 
+					    extra_spacing);
 }
 
 void
diff --git a/libnautilus-extensions/nautilus-preferences-item.h b/libnautilus-extensions/nautilus-preferences-item.h
index 2dbb2cb8e..7513b63fc 100644
--- a/libnautilus-extensions/nautilus-preferences-item.h
+++ b/libnautilus-extensions/nautilus-preferences-item.h
@@ -93,8 +93,8 @@ void       nautilus_preferences_item_set_constrained_integer_values (NautilusPre
 								     const char                           *labels);
 gboolean   nautilus_preferences_item_child_is_caption               (const NautilusPreferencesItem        *preferences_item);
 int        nautilus_preferences_item_get_caption_title_label_width  (const NautilusPreferencesItem        *item);
-void       nautilus_preferences_item_set_caption_spacing            (NautilusPreferencesItem              *item,
-								     int                                   spacing);
+void       nautilus_preferences_item_set_caption_extra_spacing      (NautilusPreferencesItem              *item,
+								     int                                   extra_spacing);
 void       nautilus_preferences_item_update_showing                 (NautilusPreferencesItem              *item);
 
 END_GNOME_DECLS
diff --git a/libnautilus-private/nautilus-caption.c b/libnautilus-private/nautilus-caption.c
index 1a2a6b307..141ce92ea 100644
--- a/libnautilus-private/nautilus-caption.c
+++ b/libnautilus-private/nautilus-caption.c
@@ -41,7 +41,6 @@ struct _NautilusCaptionDetail
 	GtkWidget *title_label;
 	GtkWidget *child;
 	gboolean show_title;
-	int spacing;
 };
 
 /* NautilusCaptionClass methods */
@@ -248,48 +247,27 @@ nautilus_caption_set_child (NautilusCaption *caption,
 			    caption->detail->child,
 			    expand,	/* expand */
 			    fill,	/* fill */
-			    caption->detail->spacing);	/* padding */
+			    0);	        /* padding */
 	
 	gtk_widget_show (caption->detail->child);
 }
 
 /**
- * nautilus_caption_set_spacing
+ * nautilus_caption_set_extra_spacing
  * @caption: A NautilusCaption
- * @spacing: Spacing in pixels between the title and the child.
+ * @spacing: Extra spacing in pixels between the title and the child,
+ * beyond the nominal amount
  *
- * Set the spacing between the title label and the caption's one
- * and only child.
+ * Set the amount of extra spacing between the title label and the 
+ * caption's one and only child.
  */
 void
-nautilus_caption_set_spacing (NautilusCaption *caption,
-			      int spacing)
+nautilus_caption_set_extra_spacing (NautilusCaption *caption,
+			      	    int extra_spacing)
 {
-	gboolean expand;
-	gboolean fill;
-	guint padding;
-	GtkPackType pack_type;
-
 	g_return_if_fail (NAUTILUS_IS_CAPTION (caption));
-	g_return_if_fail (spacing >= 0);
-
-	caption->detail->spacing = spacing;
-	
-	if (caption->detail->child == NULL) {
-		return;
-	}
+	g_return_if_fail (extra_spacing >= 0);
 
-	gtk_box_query_child_packing (GTK_BOX (caption),
-				     caption->detail->child,
-				     &expand,
-				     &fill,
-				     &padding,
-				     &pack_type);
-	
-	gtk_box_set_child_packing (GTK_BOX (caption),
-				   caption->detail->child,
-				   expand,
-				   fill,
-				   caption->detail->spacing,
-				   pack_type);
+	gtk_box_set_spacing (GTK_BOX (caption), 
+			     CAPTION_SPACING + extra_spacing);
 }
diff --git a/libnautilus-private/nautilus-caption.h b/libnautilus-private/nautilus-caption.h
index 56d0e5e46..c30a896db 100644
--- a/libnautilus-private/nautilus-caption.h
+++ b/libnautilus-private/nautilus-caption.h
@@ -80,8 +80,8 @@ void       nautilus_caption_set_child             (NautilusCaption       *captio
 						   GtkWidget             *child,
 						   gboolean               expand,
 						   gboolean               fill);
-void       nautilus_caption_set_spacing           (NautilusCaption       *caption,
-						   int                    spacing);
+void       nautilus_caption_set_extra_spacing     (NautilusCaption       *caption,
+						   int                    extra_spacing);
 int        nautilus_caption_get_title_label_width (const NautilusCaption *caption);
 
 END_GNOME_DECLS
diff --git a/libnautilus-private/nautilus-preferences-group.c b/libnautilus-private/nautilus-preferences-group.c
index 59c51bd5d..46ebf9474 100644
--- a/libnautilus-private/nautilus-preferences-group.c
+++ b/libnautilus-private/nautilus-preferences-group.c
@@ -215,7 +215,7 @@ preferences_group_align_captions (NautilusPreferencesGroup *group)
 
 			g_assert (width <= max_title_width);
 			
-			nautilus_preferences_item_set_caption_spacing (item, max_title_width - width);
+			nautilus_preferences_item_set_caption_extra_spacing (item, max_title_width - width);
 		}
 	}
 }
diff --git a/libnautilus-private/nautilus-preferences-item.c b/libnautilus-private/nautilus-preferences-item.c
index fdca87ae7..acfa2784a 100644
--- a/libnautilus-private/nautilus-preferences-item.c
+++ b/libnautilus-private/nautilus-preferences-item.c
@@ -1076,17 +1076,18 @@ nautilus_preferences_item_get_caption_title_label_width (const NautilusPreferenc
 }
 
 void
-nautilus_preferences_item_set_caption_spacing (NautilusPreferencesItem *item,
-					       int spacing)
+nautilus_preferences_item_set_caption_extra_spacing (NautilusPreferencesItem *item,
+					             int extra_spacing)
 {
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (spacing >= 0);
+	g_return_if_fail (extra_spacing >= 0);
 
 	if (!nautilus_preferences_item_child_is_caption (item)) {
 		return;
 	}
 
-	return nautilus_caption_set_spacing (NAUTILUS_CAPTION (item->details->child), spacing);
+	nautilus_caption_set_extra_spacing (NAUTILUS_CAPTION (item->details->child), 
+					    extra_spacing);
 }
 
 void
diff --git a/libnautilus-private/nautilus-preferences-item.h b/libnautilus-private/nautilus-preferences-item.h
index 2dbb2cb8e..7513b63fc 100644
--- a/libnautilus-private/nautilus-preferences-item.h
+++ b/libnautilus-private/nautilus-preferences-item.h
@@ -93,8 +93,8 @@ void       nautilus_preferences_item_set_constrained_integer_values (NautilusPre
 								     const char                           *labels);
 gboolean   nautilus_preferences_item_child_is_caption               (const NautilusPreferencesItem        *preferences_item);
 int        nautilus_preferences_item_get_caption_title_label_width  (const NautilusPreferencesItem        *item);
-void       nautilus_preferences_item_set_caption_spacing            (NautilusPreferencesItem              *item,
-								     int                                   spacing);
+void       nautilus_preferences_item_set_caption_extra_spacing      (NautilusPreferencesItem              *item,
+								     int                                   extra_spacing);
 void       nautilus_preferences_item_update_showing                 (NautilusPreferencesItem              *item);
 
 END_GNOME_DECLS