s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve border rendering without theme.

Browse Source
This commit is contained in:
Daiki Ueno
2011-10-14 10:04:16 +09:00
parent 4427f81dd9
commit 668b974dd7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eek/eek-gtk-keyboard.c
View File

@ -141,11 +141,11 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
style = gtk_widget_get_style (self); style = gtk_widget_get_style (self);
state = gtk_widget_get_state (self); state = gtk_widget_get_state (self);
color = color_from_gdk_color (&style->fg[state]); color = color_from_gdk_color (&style->text[state]);
eek_renderer_set_default_foreground_color (priv->renderer, color); eek_renderer_set_default_foreground_color (priv->renderer, color);
eek_color_free (color); eek_color_free (color);
color = color_from_gdk_color (&style->bg[state]); color = color_from_gdk_color (&style->base[state]);
eek_renderer_set_default_background_color (priv->renderer, color); eek_renderer_set_default_background_color (priv->renderer, color);
eek_color_free (color); eek_color_free (color);
} }

8
eek/eek-renderer.c
View File

@ -249,8 +249,8 @@ render_key_outline (EekRenderer *renderer,
/* need to rescale so that the border fit inside the clipping /* need to rescale so that the border fit inside the clipping
region */ region */
eek_element_get_bounds (EEK_ELEMENT(key), &bounds); eek_element_get_bounds (EEK_ELEMENT(key), &bounds);
scale = MIN((bounds.width - border_width) / bounds.width, scale = MIN((bounds.width - border_width * 2) / bounds.width,
(bounds.height - border_width) / bounds.height); (bounds.height - border_width * 2) / bounds.height);
outline = eek_keyboard_get_outline (priv->keyboard, oref); outline = eek_keyboard_get_outline (priv->keyboard, oref);
outline = eek_outline_copy (outline); outline = eek_outline_copy (outline);
@ -260,8 +260,8 @@ render_key_outline (EekRenderer *renderer,
} }
cairo_translate (cr, cairo_translate (cr,
border_width / 2 * priv->scale, border_width * priv->scale * scale,
border_width / 2 * priv->scale); border_width * priv->scale * scale);
if (gradient_type != EEK_GRADIENT_NONE) { if (gradient_type != EEK_GRADIENT_NONE) {
cairo_pattern_t *pat; cairo_pattern_t *pat;