[gnome-applets/wip/segeiger/window-picker/task-title: 4/5] windowpicker: implement theme support
- From: Sebastian Geiger <segeiger src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets/wip/segeiger/window-picker/task-title: 4/5] windowpicker: implement theme support
- Date: Tue, 9 Feb 2016 00:38:37 +0000 (UTC)
commit 35ced63ead13fbeb0e070aa420a416c86c212f2a
Author: Sebastian Geiger <sbastig gmx net>
Date: Mon Feb 8 15:41:33 2016 +0100
windowpicker: implement theme support
windowpicker/data/theme/Adwaita/Makefile.am | 8 ++
windowpicker/data/theme/HighContrast/Makefile.am | 8 ++
windowpicker/data/theme/Makefile.am | 8 ++
windowpicker/src/wp-applet.c | 77 +++++++++++++++++---
windowpicker/src/wp-resources.gresource.xml | 6 ++
5 files changed, 97 insertions(+), 10 deletions(-)
---
diff --git a/windowpicker/data/theme/Adwaita/Makefile.am b/windowpicker/data/theme/Adwaita/Makefile.am
new file mode 100644
index 0000000..2fc77be
--- /dev/null
+++ b/windowpicker/data/theme/Adwaita/Makefile.am
@@ -0,0 +1,8 @@
+NULL =
+
+EXTRA_DIST = \
+ gnome-panel.css \
+ gnome-panel-dark.css \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/windowpicker/data/theme/Adwaita/windowpicker-dark.css
b/windowpicker/data/theme/Adwaita/windowpicker-dark.css
new file mode 100644
index 0000000..e69de29
diff --git a/windowpicker/data/theme/Adwaita/windowpicker.css
b/windowpicker/data/theme/Adwaita/windowpicker.css
new file mode 100644
index 0000000..e69de29
diff --git a/windowpicker/data/theme/HighContrast/Makefile.am
b/windowpicker/data/theme/HighContrast/Makefile.am
new file mode 100644
index 0000000..2fc77be
--- /dev/null
+++ b/windowpicker/data/theme/HighContrast/Makefile.am
@@ -0,0 +1,8 @@
+NULL =
+
+EXTRA_DIST = \
+ gnome-panel.css \
+ gnome-panel-dark.css \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/windowpicker/data/theme/HighContrast/windowpicker-dark.css
b/windowpicker/data/theme/HighContrast/windowpicker-dark.css
new file mode 100644
index 0000000..e69de29
diff --git a/windowpicker/data/theme/HighContrast/windowpicker.css
b/windowpicker/data/theme/HighContrast/windowpicker.css
new file mode 100644
index 0000000..e69de29
diff --git a/windowpicker/data/theme/Makefile.am b/windowpicker/data/theme/Makefile.am
new file mode 100644
index 0000000..9765ab1
--- /dev/null
+++ b/windowpicker/data/theme/Makefile.am
@@ -0,0 +1,8 @@
+NULL =
+
+SUBDIRS = \
+ Adwaita \
+ HighContrast \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/windowpicker/src/wp-applet.c b/windowpicker/src/wp-applet.c
index e8db8fc..a60f362 100644
--- a/windowpicker/src/wp-applet.c
+++ b/windowpicker/src/wp-applet.c
@@ -38,24 +38,26 @@
#define SETTINGS_SCHEMA "org.gnome.gnome-applets.window-picker-applet"
#define GRESOURCE "/org/gnome/gnome-applets/window-picker/"
+#define GRESOURCE_THEME "/org/gnome/gnome-applets/theme/%s/windowpicker%s.css"
#define TITLE_BUTTON_SPACE 6
struct _WpApplet
{
- PanelApplet parent;
+ PanelApplet parent;
- GSettings *settings;
+ GSettings *settings;
- GtkWidget *about_dialog;
- GtkWidget *preferences_dialog;
+ GtkWidget *about_dialog;
+ GtkWidget *preferences_dialog;
+ GtkStyleProvider *provider;
- gboolean show_all_windows;
- gboolean icons_greyscale;
- gboolean expand_task_list;
+ gboolean show_all_windows;
+ gboolean icons_greyscale;
+ gboolean expand_task_list;
- GtkWidget *container;
- GtkWidget *tasks;
- GtkWidget *title;
+ GtkWidget *container;
+ GtkWidget *tasks;
+ GtkWidget *title;
};
enum
@@ -202,9 +204,57 @@ wp_applet_setup_title (WpApplet *applet)
}
static void
+theme_changed (GtkSettings *settings,
+ WpApplet *applet)
+{
+ GdkScreen *screen;
+ gchar *theme_name;
+ gboolean dark_theme;
+ guint priority;
+ gchar *resource;
+ GtkCssProvider *css;
+
+ screen = gdk_screen_get_default ();
+
+ if (applet->provider != NULL)
+ {
+ gtk_style_context_remove_provider_for_screen (screen, applet->provider);
+ g_clear_object (&applet->provider);
+ }
+
+ g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
+
+ if (g_strcmp0 (theme_name, "Adwaita") != 0 &&
+ g_strcmp0 (theme_name, "HighContrast") != 0)
+ {
+ g_free (theme_name);
+ return;
+ }
+
+ g_object_get (settings,
+ "gtk-application-prefer-dark-theme", &dark_theme,
+ NULL);
+
+ priority = GTK_STYLE_PROVIDER_PRIORITY_APPLICATION;
+ resource = g_strdup_printf (GRESOURCE_THEME,
+ theme_name, dark_theme ? "-dark" : "");
+
+ css = gtk_css_provider_new ();
+ applet->provider = GTK_STYLE_PROVIDER (css);
+
+ gtk_css_provider_load_from_resource (css, resource);
+ gtk_style_context_add_provider_for_screen (screen, applet->provider,
+ priority);
+
+ g_free (theme_name);
+ g_free (resource);
+}
+
+static void
wp_applet_load (PanelApplet *panel_applet)
{
WpApplet *applet;
+ GtkSettings *gtk_settings;
applet = WP_APPLET (panel_applet);
@@ -227,6 +277,13 @@ wp_applet_load (PanelApplet *panel_applet)
g_settings_bind (applet->settings, KEY_EXPAND_TASK_LIST,
applet, KEY_EXPAND_TASK_LIST, G_SETTINGS_BIND_GET);
+ gtk_settings = gtk_settings_get_default ();
+ g_signal_connect (gtk_settings, "notify::gtk-theme-name",
+ G_CALLBACK (theme_changed), applet);
+ g_signal_connect (gtk_settings, "notify::gtk-application-prefer-dark-theme",
+ G_CALLBACK (theme_changed), applet);
+ theme_changed(gtk_settings, applet);
+
gtk_widget_show_all (GTK_WIDGET (applet));
}
diff --git a/windowpicker/src/wp-resources.gresource.xml b/windowpicker/src/wp-resources.gresource.xml
index f9a065c..210ca7c 100644
--- a/windowpicker/src/wp-resources.gresource.xml
+++ b/windowpicker/src/wp-resources.gresource.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
+ <gresource prefix="/org/gnome/gnome-applets/theme">
+ <file alias="Adwaita/windowpicker.css">../data/theme/Adwaita/windowpicker.css</file>
+ <file alias="Adwaita/windowpicker-dark.css">../data/theme/Adwaita/windowpicker-dark.css</file>
+ <file alias="HighContrast/windowpicker.css">../data/theme/HighContrast/windowpicker.css</file>
+ <file alias="HighContrast/windowpicker-dark.css">../data/theme/HighContrast/windowpicker-dark.css</file>
+ </gresource>
<gresource prefix="/org/gnome/gnome-applets/window-picker">
<file compressed="true">wp-about-logo.png</file>
<file compressed="true">wp-preferences-dialog.ui</file>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]