AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Add generic providers per-screen.

Browse Source 
The providers are added as soon as gtk GtkSettings object for the screen
is created.
This commit is contained in:
Carlos Garnacho 2010-09-11 12:48:27 +02:00
parent 1e66155aec
commit a07fe2c0e6
2 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gtk/gtksettings.c
View File

@ -30,6 +30,8 @@
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtktypeutils.h" #include "gtktypeutils.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkcssprovider.h"
#include "gtkversion.h"
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h" #include "x11/gdkx.h"
@ -1339,6 +1341,46 @@ gtk_settings_finalize (GObject *object)
G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
} }
static void
settings_init_style (GtkSettings *settings)
{
static GtkCssProvider *css_provider = NULL;
GtkCssProvider *default_provider;
/* Add provider for user file */
if (G_UNLIKELY (!css_provider))
{
GFile *home_dir, *css_file;
gchar *filename;
css_provider = gtk_css_provider_new ();
home_dir = g_file_new_for_path (g_get_home_dir ());
filename = g_strdup_printf (".gtk-%d.0.css", GTK_MAJOR_VERSION);
css_file = g_file_get_child (home_dir, filename);
g_free (filename);
if (g_file_query_exists (css_file, NULL))
gtk_css_provider_load_from_file (css_provider, css_file, NULL);
g_object_unref (home_dir);
g_object_unref (css_file);
}
gtk_style_context_add_provider_for_screen (settings->screen,
GTK_STYLE_PROVIDER (css_provider),
GTK_STYLE_PROVIDER_PRIORITY_USER);
default_provider = gtk_css_provider_get_default ();
gtk_style_context_add_provider_for_screen (settings->screen,
GTK_STYLE_PROVIDER (default_provider),
GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
gtk_style_context_add_provider_for_screen (settings->screen,
GTK_STYLE_PROVIDER (settings),
GTK_STYLE_PROVIDER_PRIORITY_SETTINGS);
}
/** /**
* gtk_settings_get_for_screen: * gtk_settings_get_for_screen:
* @screen: a #GdkScreen. * @screen: a #GdkScreen.
@ -1364,7 +1406,7 @@ gtk_settings_get_for_screen (GdkScreen *screen)
g_object_set_data_full (G_OBJECT (screen), I_("gtk-settings"), g_object_set_data_full (G_OBJECT (screen), I_("gtk-settings"),
settings, g_object_unref); settings, g_object_unref);
gtk_rc_reparse_all_for_settings (settings, TRUE); settings_init_style (settings);
settings_update_double_click (settings); settings_update_double_click (settings);
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
settings_update_cursor_theme (settings); settings_update_cursor_theme (settings);

36
gtk/gtkwidget.c
View File

@ -13353,10 +13353,7 @@ gtk_widget_get_style_context (GtkWidget *widget)
if (G_UNLIKELY (!context)) if (G_UNLIKELY (!context))
{ {
static GtkCssProvider *css_provider = NULL;
GtkCssProvider *default_provider;
GtkWidgetPath *path; GtkWidgetPath *path;
GtkSettings *settings;
context = g_object_new (GTK_TYPE_STYLE_CONTEXT, context = g_object_new (GTK_TYPE_STYLE_CONTEXT,
"direction", gtk_widget_get_direction (widget), "direction", gtk_widget_get_direction (widget),
@ -13369,39 +13366,6 @@ gtk_widget_get_style_context (GtkWidget *widget)
quark_style_context, context, quark_style_context, context,
(GDestroyNotify) g_object_unref); (GDestroyNotify) g_object_unref);
/* Add provider for user file */
if (G_UNLIKELY (!css_provider))
{
GFile *home_dir, *css_file;
gchar *filename;
css_provider = gtk_css_provider_new ();
home_dir = g_file_new_for_path (g_get_home_dir ());
filename = g_strdup_printf (".gtk-%d.0.css", GTK_MAJOR_VERSION);
css_file = g_file_get_child (home_dir, filename);
g_free (filename);
if (g_file_query_exists (css_file, NULL))
gtk_css_provider_load_from_file (css_provider, css_file, NULL);
g_object_unref (home_dir);
g_object_unref (css_file);
}
gtk_style_context_add_provider (context,
GTK_STYLE_PROVIDER (css_provider),
GTK_STYLE_PROVIDER_PRIORITY_USER);
default_provider = gtk_css_provider_get_default ();
gtk_style_context_add_provider (context,
GTK_STYLE_PROVIDER (default_provider),
GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
settings = gtk_widget_get_settings (widget);
gtk_style_context_add_provider (context,
GTK_STYLE_PROVIDER (settings),
GTK_STYLE_PROVIDER_PRIORITY_SETTINGS);
gtk_style_context_set_screen (context, gtk_style_context_set_screen (context,
gtk_widget_get_screen (widget)); gtk_widget_get_screen (widget));