diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-04-12 01:12:43 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-04-12 01:12:43 +0100 |
| commit | 997e8999d5a3a496a81d45b37f723d5bc539f5c4 (patch) | |
| tree | 9917f68ec795c642abe11e9f6f6d4982cf458ede /gtk/preferences.c | |
| parent | f3158f79b6357558e3a0083039857bba21c6ca5b (diff) | |
| download | netsurf-997e8999d5a3a496a81d45b37f723d5bc539f5c4.tar.gz netsurf-997e8999d5a3a496a81d45b37f723d5bc539f5c4.tar.bz2 | |
Refactor GTK toolbar handling to correctly cope with text labels
Diffstat (limited to 'gtk/preferences.c')
| -rw-r--r-- | gtk/preferences.c | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/gtk/preferences.c b/gtk/preferences.c index 7348afdc9..ec09fe766 100644 --- a/gtk/preferences.c +++ b/gtk/preferences.c @@ -861,39 +861,9 @@ nsgtk_preferences_comboButtonType_changed(GtkComboBox *widget, current = nsgtk_scaffolding_iterate(NULL); while (current != NULL) { nsgtk_scaffolding_reset_offset(current); - switch(nsoption_int(button_type)) { - /* value of 0 is reserved for 'unset' */ - case 1: - gtk_toolbar_set_style( - GTK_TOOLBAR(nsgtk_scaffolding_toolbar(current)), - GTK_TOOLBAR_ICONS); - gtk_toolbar_set_icon_size( - GTK_TOOLBAR(nsgtk_scaffolding_toolbar(current)), - GTK_ICON_SIZE_SMALL_TOOLBAR); - break; - case 2: - gtk_toolbar_set_style( - GTK_TOOLBAR(nsgtk_scaffolding_toolbar(current)), - GTK_TOOLBAR_ICONS); - gtk_toolbar_set_icon_size( - GTK_TOOLBAR(nsgtk_scaffolding_toolbar(current)), - GTK_ICON_SIZE_LARGE_TOOLBAR); - break; - case 3: - gtk_toolbar_set_style( - GTK_TOOLBAR(nsgtk_scaffolding_toolbar(current)), - GTK_TOOLBAR_BOTH); - gtk_toolbar_set_icon_size( - GTK_TOOLBAR(nsgtk_scaffolding_toolbar(current)), - GTK_ICON_SIZE_LARGE_TOOLBAR); - break; - case 4: - gtk_toolbar_set_style( - GTK_TOOLBAR(nsgtk_scaffolding_toolbar(current)), - GTK_TOOLBAR_TEXT); - default: - break; - } + + nsgtk_scaffolding_toolbars(current, nsoption_int(button_type)); + current = nsgtk_scaffolding_iterate(current); } } |