From 65268c513aeb225cbd7a8b0e16c566191eb0fd01 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Sat, 23 Jan 2016 15:28:33 +0100 Subject: GTK3: Expand scrolled windows taken from: https://git.gnome.org/browse/gnome-dictionary/commit/?h=gnome-3-8&id=f50f8b5 --- mate-dictionary/libgdict/gdict-database-chooser.c | 3 +++ mate-dictionary/libgdict/gdict-defbox.c | 5 +++++ mate-dictionary/libgdict/gdict-strategy-chooser.c | 3 +++ 3 files changed, 11 insertions(+) diff --git a/mate-dictionary/libgdict/gdict-database-chooser.c b/mate-dictionary/libgdict/gdict-database-chooser.c index 2a4eb73f..8804dbc5 100644 --- a/mate-dictionary/libgdict/gdict-database-chooser.c +++ b/mate-dictionary/libgdict/gdict-database-chooser.c @@ -341,6 +341,9 @@ gdict_database_chooser_constructor (GType type, gtk_widget_push_composite_child (); sw = gtk_scrolled_window_new (NULL, NULL); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_hexpand (sw, TRUE); +#endif gtk_widget_set_composite_name (sw, "gdict-database-chooser-scrolled-window"); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, diff --git a/mate-dictionary/libgdict/gdict-defbox.c b/mate-dictionary/libgdict/gdict-defbox.c index c85efdd2..cc6b6ae2 100644 --- a/mate-dictionary/libgdict/gdict-defbox.c +++ b/mate-dictionary/libgdict/gdict-defbox.c @@ -1654,10 +1654,15 @@ gdict_defbox_constructor (GType type, gtk_widget_push_composite_child (); sw = gtk_scrolled_window_new (NULL, NULL); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_vexpand (sw, TRUE); +#endif gtk_widget_set_composite_name (sw, "gdict-defbox-scrolled-window"); +#if !GTK_CHECK_VERSION (3, 0, 0) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +#endif gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN); gtk_box_pack_start (GTK_BOX (defbox), sw, TRUE, TRUE, 0); diff --git a/mate-dictionary/libgdict/gdict-strategy-chooser.c b/mate-dictionary/libgdict/gdict-strategy-chooser.c index d78ef1b4..e3190bc7 100644 --- a/mate-dictionary/libgdict/gdict-strategy-chooser.c +++ b/mate-dictionary/libgdict/gdict-strategy-chooser.c @@ -328,6 +328,9 @@ gdict_strategy_chooser_constructor (GType type, gtk_widget_push_composite_child (); sw = gtk_scrolled_window_new (NULL, NULL); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_set_hexpand (sw, TRUE); +#endif gtk_widget_set_composite_name (sw, "gdict-strategy-chooser-scrolled-window"); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, -- cgit v1.2.1