diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-17 18:16:59 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-07-17 18:26:58 +0800 |
| commit | 665c4b22ad55795ce89f0a4894efd8ed9630cf68 (patch) | |
| tree | 15d8c78ae2473ed16820411db716511085685cd8 | |
| parent | efc1898b70b78022bd8ec91cd54fb53c368ba714 (diff) | |
| download | gsoc2013-evolution-665c4b22ad55795ce89f0a4894efd8ed9630cf68.tar.gz gsoc2013-evolution-665c4b22ad55795ce89f0a4894efd8ed9630cf68.tar.zst gsoc2013-evolution-665c4b22ad55795ce89f0a4894efd8ed9630cf68.zip | |
Disable my evil GtkExpander hack in EAttachmentPaned.
The new height-for-width logic in GTK3 doesn't like my trick to center a
GtkExpander's label widget, so I have to disable it entirely for GTK3 or
else Evolution crashes when opening a composer window.
Bug #614049 has a GtkExpander patch that would let me do it properly.
| -rw-r--r-- | widgets/misc/e-attachment-paned.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index c9282c7718..83a00692d8 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -592,11 +592,19 @@ attachment_paned_init (EAttachmentPaned *paned) * * 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. */ + * 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); |