callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkToolPalette: Use gtk-toolbar-style and gtk-toolbar-icon-size settings.

Browse Source 
* gtk/gtksettings.c: (settings_install_property_parser): Handle enums too.
	* gtk/gtktoolbar.c (gtk_toolbar_class_init): Move the gtk-toolbar-style and
	gtk-toolbar-icon-size settings into GtkSettings because we now use it in
	GtkToolPalette too.

	* gtk/gtktoolpalette.[h|c]: Add gtk_tool_palette_unset_style() and
	gtk_tool_palette_unset_icon_size(), and use the toolbar-style and
	icon-size from GtkSettings if these are not set via the set functions.

	* demos/gtk-demo/toolpalette.c (on_combo_style_changed),
	(do_toolpalette): Add and handle a -1 value to mean the desktop "Default"
	toolbar style.
This commit is contained in:
Murray Cumming
2009-07-16 17:51:55 +02:00
parent a14e05fa59
commit eb76666f1c
7 changed files with 319 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
demos/gtk-demo/toolpalette.c
View File

@ -46,7 +46,10 @@ static void on_combo_style_changed(GtkComboBox *combo_box, gpointer user_data)
gint val = 0;
gtk_tree_model_get (model, &iter, 1, &val, -1);
gtk_tool_palette_set_style (palette, val);
if (val == -1)
gtk_tool_palette_unset_style (palette);
else
gtk_tool_palette_set_style (palette, val);
}
GtkWidget *
@ -112,6 +115,9 @@ do_toolpalette (GtkWidget *do_widget)
gtk_list_store_append (combo_style_model, &iter);
gtk_list_store_set (combo_style_model, &iter,
0, "Icons", 1, GTK_TOOLBAR_ICONS, -1);
gtk_list_store_append (combo_style_model, &iter);
gtk_list_store_set (combo_style_model, &iter,
0, "Default", 1, -1 /* A custom meaning for this demo. */, -1);
combo_style = gtk_combo_box_new_with_model (
GTK_TREE_MODEL (combo_style_model));
cell_renderer = gtk_cell_renderer_text_new ();