From 90c70d0bc44d4d4c7d68c2382f20bb18483a3d26 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Sep 2010 13:45:25 -0400 Subject: EAttachmentPaned: Use gtk_expander_set_label_fill() Use the new GtkExpander:label-fill property in GTK+ 2.22, which was added specifically to get rid of my evil hack in EAttachmentPaned. --- widgets/misc/e-attachment-paned.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'widgets/misc/e-attachment-paned.c') diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index 9e2b73cf35..683da6b933 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -580,6 +580,7 @@ e_attachment_paned_init (EAttachmentPaned *paned) widget = gtk_expander_new (NULL); gtk_expander_set_spacing (GTK_EXPANDER (widget), 0); + gtk_expander_set_label_fill (GTK_EXPANDER (widget), TRUE); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); paned->priv->expander = g_object_ref (widget); gtk_widget_show (widget); @@ -604,25 +605,8 @@ e_attachment_paned_init (EAttachmentPaned *paned) container = paned->priv->expander; - /* Request the width to be as large as possible, and let the - * GtkExpander allocate what space there is. This effectively - * packs the widget to expand. - * - * XXX This hack causes nasty side-effects in RTL locales, - * so check the reading direction before applying it. - * See GNOME bug #614049 for details + screenshot. - * - * XXX It also trips a height-for-width assertion GTK+ 3. - * The same GNOME bug has a patch to add a "label-fill" - * boolean property to GtkExpander to allow me to do - * what I'm trying to do here properly. - */ widget = gtk_hbox_new (FALSE, 6); gtk_size_group_add_widget (size_group, widget); -#if !GTK_CHECK_VERSION(2,90,0) - if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL) - gtk_widget_set_size_request (widget, G_MAXINT, -1); -#endif gtk_expander_set_label_widget (GTK_EXPANDER (container), widget); gtk_widget_show (widget); -- cgit