diff options
| author | Sergey V. Udaltsov <svu@gnome.org> | 2010-12-12 00:40:29 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2010-12-12 00:43:22 +0000 |
| commit | 953d7db853ef7384508072c9a004603f408dc2fc (patch) | |
| tree | 037b5a2944c86d90a3377e18576fadb2f525f5e2 | |
| parent | 8bfd70abf09a3c462abb3aa3288949645ff6f55a (diff) | |
Making xkb options fill the full popup dlg
https://bugzilla.gnome.org/show_bug.cgi?id=636902
| -rw-r--r-- | panels/region/gnome-region-panel-options-dialog.ui | 2 | ||||
| -rw-r--r-- | panels/region/gnome-region-panel-xkbot.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/panels/region/gnome-region-panel-options-dialog.ui b/panels/region/gnome-region-panel-options-dialog.ui index 069144480..01c93495c 100644 --- a/panels/region/gnome-region-panel-options-dialog.ui +++ b/panels/region/gnome-region-panel-options-dialog.ui @@ -11,7 +11,7 @@ <property name="default_height">400</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox4"> + <object class="GtkVBox" id="dialog_vbox"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="orientation">vertical</property> diff --git a/panels/region/gnome-region-panel-xkbot.c b/panels/region/gnome-region-panel-xkbot.c index aa5eda203..333aa1853 100644 --- a/panels/region/gnome-region-panel-xkbot.c +++ b/panels/region/gnome-region-panel-xkbot.c @@ -375,8 +375,10 @@ void xkb_options_load_options (GtkBuilder * dialog) { GtkWidget *opts_vbox = WID ("options_vbox"); - GSList *expanders_list; + GtkWidget *dialog_vbox = WID ("dialog_vbox"); + GtkWidget *options_scroll = WID ("options_scroll"); GtkWidget *expander; + GSList *expanders_list; current1st_level_id = NULL; current_none_radio = NULL; @@ -403,7 +405,10 @@ xkb_options_load_options (GtkBuilder * dialog) expanders_list = expanders_list->next; } - gtk_widget_show_all (opts_vbox); + /* Somewhere in gtk3 the top vbox in dialog is made non-expandable */ + gtk_box_set_child_packing (GTK_BOX (dialog_vbox), options_scroll, + TRUE, TRUE, 0, GTK_PACK_START); + gtk_widget_show_all (dialog_vbox); } static void @@ -443,8 +448,7 @@ xkb_options_popup_dialog (GtkBuilder * dialog) chooser = CWID ("xkb_options_dialog"); gtk_window_set_transient_for (GTK_WINDOW (chooser), - GTK_WINDOW (WID - ("region_dialog"))); + GTK_WINDOW (WID ("region_dialog"))); xkb_options_load_options (chooser_dialog); g_signal_connect (chooser, "response", |