From 6e978cae63950626ee007c8c8276b35f054a98bc Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Sat, 22 Jan 2011 16:13:53 +0900
Subject: [PATCH] Move "blank background" code from EekGtkKeyboard to
 EekRenderer.

---
 eek/eek-gtk-keyboard.c | 30 +-----------------------------
 eek/eek-renderer.c     |  6 +++++-
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c
index ea4298bb..0d3fbcd7 100644
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@@ -85,7 +85,6 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
 {
     EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
     GtkAllocation allocation;
-    EekColor background;
 
     gtk_widget_get_allocation (self, &allocation);
 
@@ -112,20 +111,6 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
              color_from_gdk_color (&style->bg[state]));
     }
 
-    /* blank background */
-    eek_renderer_get_background (priv->renderer, &background);
-    cairo_set_source_rgba (cr,
-                           background.red,
-                           background.green,
-                           background.blue,
-                           background.alpha);
-    cairo_rectangle (cr,
-                     0.0,
-                     0.0,
-                     allocation.width,
-                     allocation.height);
-    cairo_fill (cr);
-
     eek_renderer_render_keyboard (priv->renderer, cr);
 
 #if GTK_CHECK_VERSION (2, 91, 2)
@@ -336,8 +321,6 @@ on_key_released (EekKeyboard *keyboard,
     EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
     cairo_t *cr;
     EekBounds bounds, large_bounds;
-    EekColor background;
-    cairo_path_t *cp;
 
     /* renderer may have not been set yet if the widget is a popup */
     if (!priv->renderer)
@@ -346,25 +329,14 @@ on_key_released (EekKeyboard *keyboard,
     cr = gdk_cairo_create (GDK_DRAWABLE (gtk_widget_get_window (widget)));
 
     eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-    magnify_bounds (&bounds, &large_bounds, 1.5);
+    magnify_bounds (&bounds, &large_bounds, 2.0);
     cairo_rectangle (cr,
                      large_bounds.x,
                      large_bounds.y,
                      large_bounds.width,
                      large_bounds.height);
-    cp = cairo_copy_path (cr);
     cairo_clip (cr);
-
-    eek_renderer_get_background (priv->renderer, &background);
-    cairo_set_source_rgba (cr,
-                           background.red,
-                           background.green,
-                           background.blue,
-                           background.alpha);
-    cairo_append_path (cr, cp);
-    cairo_fill (cr);
     eek_renderer_render_keyboard (priv->renderer, cr);
-    cairo_path_destroy (cp);
     cairo_destroy (cr);
 }
 
diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c
index 88c22c45..e6b37c08 100644
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@@ -115,7 +115,11 @@ create_keyboard_surface (EekRenderer *renderer)
     cairo_translate (data.cr, bounds.x * priv->scale, bounds.y * priv->scale);
 
     /* blank background */
-    cairo_set_source_rgba (data.cr, 0, 0, 0, 0);
+    cairo_set_source_rgba (data.cr,
+                           priv->background->red,
+                           priv->background->green,
+                           priv->background->blue,
+                           priv->background->alpha);
     cairo_rectangle (data.cr,
                      0.0,
                      0.0,