[gimp/gtk3-port: 234/236] app: GimpDock: port font size modification to GtkCssProvider
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 234/236] app: GimpDock: port font size modification to GtkCssProvider
- Date: Wed, 27 Jul 2011 19:08:10 +0000 (UTC)
commit 6cf7db8fe599afb0bffcc9c8a9397d319a805a90
Author: Michael Natterer <mitch gimp org>
Date: Sat May 7 01:18:59 2011 +0200
app: GimpDock: port font size modification to GtkCssProvider
app/widgets/gimpdock.c | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
---
diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c
index 85db7e7..4cb11fa 100644
--- a/app/widgets/gimpdock.c
+++ b/app/widgets/gimpdock.c
@@ -68,6 +68,7 @@ struct _GimpDockPrivate
GList *dockbooks;
gint ID;
+ GtkCssProvider *css_provider;
};
@@ -172,7 +173,7 @@ gimp_dock_init (GimpDock *dock)
dock->p = G_TYPE_INSTANCE_GET_PRIVATE (dock,
GIMP_TYPE_DOCK,
GimpDockPrivate);
- dock->p->ID = dock_ID++;
+ dock->p->ID = dock_ID++;
name = g_strdup_printf ("gimp-internal-dock-%d", dock->p->ID);
gtk_widget_set_name (GTK_WIDGET (dock), name);
@@ -203,6 +204,16 @@ gimp_dock_dispose (GObject *object)
while (dock->p->dockbooks)
gimp_dock_remove_book (dock, GIMP_DOCKBOOK (dock->p->dockbooks->data));
+ if (dock->p->css_provider)
+ {
+ GtkWidget *widget = GTK_WIDGET (object);
+
+ gtk_style_context_remove_provider_for_screen (gtk_widget_get_screen (widget),
+ GTK_STYLE_PROVIDER (dock->p->css_provider));
+ g_object_unref (dock->p->css_provider);
+ dock->p->css_provider = NULL;
+ }
+
G_OBJECT_CLASS (parent_class)->dispose (object);
}
@@ -224,7 +235,7 @@ gimp_dock_style_updated (GtkWidget *widget)
PangoFontDescription *font_desc;
gint font_size;
gchar *font_str;
- gchar *rc_string;
+ gchar *css_string;
context = gtk_widget_get_pango_context (widget);
font_desc = pango_context_get_font_description (context);
@@ -237,20 +248,26 @@ gimp_dock_style_updated (GtkWidget *widget)
font_str = pango_font_description_to_string (font_desc);
pango_font_description_free (font_desc);
- rc_string =
- g_strdup_printf ("style \"gimp-dock-style\""
- "{"
- " font_name = \"%s\""
- "}"
- "widget \"*.gimp-internal-dock-%d.*\" style \"gimp-dock-style\"",
- font_str,
- dock->p->ID);
+ css_string = g_strdup_printf ("#gimp-internal-dock-%d * {\n"
+ " font: %s;\n"
+ "}",
+ dock->p->ID,
+ font_str);
g_free (font_str);
- gtk_rc_parse_string (rc_string);
- g_free (rc_string);
+ if (! dock->p->css_provider)
+ {
+ dock->p->css_provider = gtk_css_provider_new ();
+ gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (widget),
+ GTK_STYLE_PROVIDER (dock->p->css_provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ }
+
+ gtk_css_provider_load_from_data (dock->p->css_provider,
+ css_string, -1, NULL);
+ g_free (css_string);
- gtk_widget_reset_rc_styles (widget);
+ gtk_widget_reset_style (widget);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]