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

switch: Remove hack to change text size

Browse Source 
The same effect can now be achieved via
  .switch { font-size: smaller; }
so there is no need to hardcode things.
This commit is contained in:
Benjamin Otte 2012-12-06 02:54:18 +01:00
parent 1b1f4da5c7
commit 82a6106920
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkswitch.c
View File

@ -524,15 +524,12 @@ gtk_switch_draw (GtkWidget *widget,
GtkStyleContext *context; GtkStyleContext *context;
GdkRectangle handle; GdkRectangle handle;
PangoLayout *layout; PangoLayout *layout;
PangoFontDescription *desc;
const PangoFontDescription *style_desc;
PangoRectangle rect; PangoRectangle rect;
gint label_x, label_y; gint label_x, label_y;
GtkBorder padding; GtkBorder padding;
GtkStateFlags state; GtkStateFlags state;
gint focus_width, focus_pad; gint focus_width, focus_pad;
gint x, y, width, height; gint x, y, width, height;
gint font_size, style_font_size;
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
@ -585,20 +582,6 @@ gtk_switch_draw (GtkWidget *widget,
*/ */
layout = gtk_widget_create_pango_layout (widget, C_("switch", "ON")); layout = gtk_widget_create_pango_layout (widget, C_("switch", "ON"));
/* FIXME: this should be really done in the theme, but overriding font size
* from it doesn't currently work. So we have to hardcode this here and
* below for the "OFF" label.
*/
desc = pango_font_description_new ();
style_desc = gtk_style_context_get_font (context, state);
style_font_size = pango_font_description_get_size (style_desc);
font_size = MAX (style_font_size - 1 * PANGO_SCALE, ceil (style_font_size * PANGO_SCALE_SMALL));
pango_font_description_set_size (desc, font_size);
pango_layout_set_font_description (layout, desc);
pango_layout_get_extents (layout, NULL, &rect); pango_layout_get_extents (layout, NULL, &rect);
pango_extents_to_pixels (&rect, NULL); pango_extents_to_pixels (&rect, NULL);
@ -613,7 +596,6 @@ gtk_switch_draw (GtkWidget *widget,
* glyphs then use WHITE CIRCLE (U+25CB) as the text for the state * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
*/ */
layout = gtk_widget_create_pango_layout (widget, C_("switch", "OFF")); layout = gtk_widget_create_pango_layout (widget, C_("switch", "OFF"));
pango_layout_set_font_description (layout, desc);
pango_layout_get_extents (layout, NULL, &rect); pango_layout_get_extents (layout, NULL, &rect);
pango_extents_to_pixels (&rect, NULL); pango_extents_to_pixels (&rect, NULL);
@ -636,8 +618,6 @@ gtk_switch_draw (GtkWidget *widget,
gtk_switch_paint_handle (widget, cr, &handle); gtk_switch_paint_handle (widget, cr, &handle);
pango_font_description_free (desc);
return FALSE; return FALSE;
} }