[gnome-system-monitor/wip/newdesign] Use standard font size and type from stylecontext on colorpickers
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor/wip/newdesign] Use standard font size and type from stylecontext on colorpickers
- Date: Sat, 17 Aug 2013 10:47:00 +0000 (UTC)
commit 7a5e96df0afdce9880a9034ae255d0965ad17ab5
Author: Robert Roth <robert roth off gmail com>
Date: Sat Aug 17 13:46:20 2013 +0300
Use standard font size and type from stylecontext on colorpickers
src/gsm_color_button.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/src/gsm_color_button.c b/src/gsm_color_button.c
index 4deb10f..633c969 100644
--- a/src/gsm_color_button.c
+++ b/src/gsm_color_button.c
@@ -198,8 +198,9 @@ gsm_color_button_draw (GtkWidget *widget, cairo_t * cr)
gdouble radius, arc_start, arc_end;
gdouble highlight_factor;
gboolean sensitive = gtk_widget_get_sensitive (widget);
- PangoLayout* layout;
+ PangoLayout* layout = NULL;
PangoRectangle extents;
+ PangoFontDescription* font_desc;
GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (widget));
if (sensitive && priv->highlight > 0) {
@@ -227,12 +228,17 @@ gsm_color_button_draw (GtkWidget *widget, cairo_t * cr)
cairo_set_source_rgba (cr, 1, 1, 1, 0.4);
cairo_rectangle (cr, 1.5, 1.5, width - 3, height - 3);
cairo_stroke (cr);
+ gtk_style_context_get (context, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_FONT, &font_desc, NULL);
+// pango_font_description_set_size (font_desc, 10 * PANGO_SCALE );
+
if (priv->text != NULL) {
// label text with the usage percentage or network rate
- gchar *markup = g_strdup_printf ("<span font='sans'>%s</span>", priv->text);
+ gchar *text = g_strdup (priv->text);
layout = pango_cairo_create_layout (cr);
- pango_layout_set_markup (layout, markup, -1);
- g_free (markup);
+ pango_layout_set_font_description (layout, font_desc);
+ pango_font_description_free (font_desc);
+ pango_layout_set_text (layout, text, -1);
+ g_free (text);
pango_layout_get_pixel_extents (layout, NULL, &extents);
}
switch (priv->type)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]