From 2d2aea009e6d8f8cd9777190dec34d41a931ae14 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 12 Aug 2011 16:25:56 +0900 Subject: [PATCH] Rewrite 15c0a9da using cairo_pattern_set_extend. --- eek/eek-gtk-keyboard.c | 12 ------------ eek/eek-renderer.c | 3 +++ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c index 4c1a3e58..adcd04e2 100644 --- a/eek/eek-gtk-keyboard.c +++ b/eek/eek-gtk-keyboard.c @@ -419,7 +419,6 @@ on_key_released (EekKeyboard *keyboard, EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget); cairo_t *cr; EekBounds bounds, large_bounds; - EekColor background; /* renderer may have not been set yet if the widget is a popup */ if (!priv->renderer) @@ -436,17 +435,6 @@ on_key_released (EekKeyboard *keyboard, large_bounds.height); cairo_clip (cr); - /* blank background, in case that a large key does not fit in the - keyboard */ - eek_renderer_get_background_color (priv->renderer, - EEK_ELEMENT(priv->keyboard), - &background); - cairo_set_source_rgba (cr, - background.red, - background.green, - background.blue, - background.alpha); - cairo_paint (cr); eek_renderer_render_keyboard (priv->renderer, cr); cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); cairo_destroy (cr); diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c index 28cdadb4..187f39c3 100644 --- a/eek/eek-renderer.c +++ b/eek/eek-renderer.c @@ -647,6 +647,7 @@ eek_renderer_real_render_keyboard (EekRenderer *self, cairo_t *cr) { EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(self); + cairo_pattern_t *source; g_return_if_fail (priv->keyboard); g_return_if_fail (priv->allocation_width > 0.0); @@ -656,6 +657,8 @@ eek_renderer_real_render_keyboard (EekRenderer *self, priv->keyboard_surface = create_keyboard_surface (self); cairo_set_source_surface (cr, priv->keyboard_surface, 0.0, 0.0); + source = cairo_get_source (cr); + cairo_pattern_set_extend (source, CAIRO_EXTEND_PAD); cairo_paint (cr); }