summaryrefslogtreecommitdiff
path: root/ui/gtk/prefs_dlg.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2013-03-13 20:04:48 +0000
committerBill Meier <wmeier@newsguy.com>2013-03-13 20:04:48 +0000
commitea64ac193701a91fc4cf6657ac524f34e786931d (patch)
tree63fc89dc242124cdbc9378cb0ca3b147e1cdb32e /ui/gtk/prefs_dlg.c
parent35daeed3f174bdc571f23424bad6c30427338ece (diff)
downloadwireshark-ea64ac193701a91fc4cf6657ac524f34e786931d.tar.gz
Certain prefs window contents should not be centered vertically in GTK3.
(Fix: prevent vertical expand/fill of grid widget in certain cases). (This stuff in GTK3 about "parents inheriting expand/fill properties from children" is driving me crazy). svn path=/trunk/; revision=48280
Diffstat (limited to 'ui/gtk/prefs_dlg.c')
-rw-r--r--ui/gtk/prefs_dlg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index 39ea01cf80..ad9457fa40 100644
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -154,7 +154,7 @@ pref_show(pref_t *pref, gpointer user_data)
g_strlcat(label_string, ":", label_len);
pref_stash(pref, NULL);
-
+
/* Save the current value of the preference, so that we can revert it if
the user does "Apply" and then "Cancel", and create the control for
editing the preference. */
@@ -412,6 +412,7 @@ module_prefs_show(module_t *module, gpointer user_data)
/* Main grid */
main_grid = ws_gtk_grid_new();
gtk_box_pack_start(GTK_BOX(main_vb), main_grid, FALSE, FALSE, 0);
+ gtk_widget_set_vexpand(GTK_WIDGET(main_grid), FALSE); /* Ignore VEXPAND requests from children */
ws_gtk_grid_set_row_spacing(GTK_GRID(main_grid), 10);
ws_gtk_grid_set_column_spacing(GTK_GRID(main_grid), 15);