summaryrefslogtreecommitdiff
path: root/ui/gtk/prefs_gui.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_gui.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_gui.c')
-rw-r--r--ui/gtk/prefs_gui.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index 2a325584d1..7e0fcf4416 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -167,6 +167,7 @@ gui_prefs_show(void)
/* 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);
@@ -561,3 +562,16 @@ scroll_percent_changed_cb(GtkWidget *recent_files_entry _U_,
/* We really should pop up a dialog box is newval < 0 or > 100 */
return FALSE;
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */