HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instantly update the toolbar icon size and style when the corresponding global GTK settings are changed.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4819 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2010-04-11 21:56:34 +00:00
parent fef3ee8fc5
commit 10bdf624db
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -10,6 +10,9 @@
src/toolbar.c, src/toolbar.h: src/toolbar.c, src/toolbar.h:
Shorten the toolbar popup menu, only provide items for Toolbar Shorten the toolbar popup menu, only provide items for Toolbar
Preferences and to Hide the toolbar. Preferences and to Hide the toolbar.
* src/toolbar.c:
Instantly update the toolbar icon size and style when the
corresponding global GTK settings are changed.
2010-04-09 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> 2010-04-09 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>

26
src/toolbar.c
View File

@ -316,6 +316,24 @@ static GtkWidget *toolbar_reload(const gchar *markup)
} }
static void toolbar_notify_style_cb(GObject *object, GParamSpec *arg1, gpointer data)
{
const gchar *arg_name = g_param_spec_get_name(arg1);
gint value;
if (toolbar_prefs.use_gtk_default_style && utils_str_equal(arg_name, "gtk-toolbar-style"))
{
value = ui_get_gtk_settings_integer(arg_name, toolbar_prefs.icon_style);
gtk_toolbar_set_style(GTK_TOOLBAR(main_widgets.toolbar), value);
}
else if (toolbar_prefs.use_gtk_default_icon && utils_str_equal(arg_name, "gtk-toolbar-size"))
{
value = ui_get_gtk_settings_integer(arg_name, toolbar_prefs.icon_size);
gtk_toolbar_set_icon_size(GTK_TOOLBAR(main_widgets.toolbar), value);
}
}
GtkWidget *toolbar_init(void) GtkWidget *toolbar_init(void)
{ {
GtkWidget *toolbar; GtkWidget *toolbar;
@ -324,6 +342,7 @@ GtkWidget *toolbar_init(void)
GtkAction *action_build; GtkAction *action_build;
GtkAction *action_searchentry; GtkAction *action_searchentry;
GtkAction *action_gotoentry; GtkAction *action_gotoentry;
GtkSettings *gtk_settings;
uim = gtk_ui_manager_new(); uim = gtk_ui_manager_new();
group = gtk_action_group_new("GeanyToolbar"); group = gtk_action_group_new("GeanyToolbar");
@ -375,6 +394,13 @@ GtkWidget *toolbar_init(void)
toolbar = toolbar_reload(NULL); toolbar = toolbar_reload(NULL);
gtk_settings = gtk_widget_get_settings(GTK_WIDGET(toolbar));
if (gtk_settings != NULL)
{
g_signal_connect(gtk_settings, "notify::gtk-toolbar-style",
G_CALLBACK(toolbar_notify_style_cb), NULL);
}
return toolbar; return toolbar;
} }