[maemo-commits] [maemo-commits] r13660 - in projects/haf/trunk/hildon-input-method-plugins-example: . src

[From: subversion at stage.maemo.org]

Author: tjunnone
Date: 2007-09-07 11:27:46 +0300 (Fri, 07 Sep 2007)
New Revision: 13660

Modified:
   projects/haf/trunk/hildon-input-method-plugins-example/ChangeLog
   projects/haf/trunk/hildon-input-method-plugins-example/src/him-vkb-example.c
Log:
* src/hildon-vkb-example.c: Center layouts on keys


Modified: projects/haf/trunk/hildon-input-method-plugins-example/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method-plugins-example/ChangeLog	2007-09-07 08:23:35 UTC (rev 13659)
+++ projects/haf/trunk/hildon-input-method-plugins-example/ChangeLog	2007-09-07 08:27:46 UTC (rev 13660)
@@ -1,3 +1,7 @@
+2007-09-07  Tomas Junnonen  <tomas.junnonen at nokia.com>
+
+	* src/hildon-vkb-example.c: Center layouts on keys
+
 2007-07-31  Tomas Junnonen  <tomas.junnonen at nokia.com>
 
 	* src/hildon-vkb-example.c:

Modified: projects/haf/trunk/hildon-input-method-plugins-example/src/him-vkb-example.c
===================================================================
--- projects/haf/trunk/hildon-input-method-plugins-example/src/him-vkb-example.c	2007-09-07 08:23:35 UTC (rev 13659)
+++ projects/haf/trunk/hildon-input-method-plugins-example/src/him-vkb-example.c	2007-09-07 08:27:46 UTC (rev 13660)
@@ -574,6 +574,8 @@
 draw_key (HimExampleVKB *vkb, VKBKey *key, GtkStateType state, gint case_mode)
 {
   HimExampleVKBPrivate *priv;
+  PangoRectangle extents;
+
   g_return_if_fail (IS_HIMEXAMPLE_VKB (vkb));
   g_return_if_fail (key != NULL);
   priv = HIMEXAMPLE_VKB_GET_PRIVATE (vkb);
@@ -585,6 +587,8 @@
   }
 
   priv->style->depth = gdk_drawable_get_depth (((GtkWidget*)vkb)->window);
+
+  pango_layout_get_pixel_extents(priv->layout, &extents, NULL);
   
   gtk_paint_box (priv->style, 
       GTK_WIDGET(vkb)->window, 
@@ -598,7 +602,7 @@
       GTK_WIDGET(vkb)->window, 
       state, 
       TRUE, NULL, GTK_WIDGET(vkb), NULL, 
-      key->x + KEY_LABEL_MARGIN, key->y, 
+      key->x + ((key->width - extents.width) / 2), key->y, 
       priv->layout);
 }
 
@@ -774,7 +778,6 @@
 static gboolean 
 expose_cb (GtkWidget *widget, GdkEventExpose *event)
 {
-
   draw_keyboard (HIMEXAMPLE_VKB (widget));
   return TRUE;
 }