r4308 - in trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: . data/gtk-2.0 src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2008-04-04 14:02:33 +0200 (Fri, 04 Apr 2008)
New Revision: 4308

Modified:
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
Log:
2008-04-04  Thomas Wood  <thomas at openedhand.com>

	* data/gtk-2.0/openmoko-dialer: Add borders to keypad buttons
	* src/moko-draw.c: (moko_draw_box): Implement border option


Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog	2008-04-03 16:37:21 UTC (rev 4307)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog	2008-04-04 12:02:33 UTC (rev 4308)
@@ -1,3 +1,8 @@
+2008-04-04  Thomas Wood  <thomas at openedhand.com>
+
+	* data/gtk-2.0/openmoko-dialer: Add borders to keypad buttons
+	* src/moko-draw.c: (moko_draw_box): Implement border option
+
 2008-04-03  Thomas Wood  <thomas at openedhand.com>
 
 	* data/matchbox/closebutton.xpm:

Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer	2008-04-03 16:37:21 UTC (rev 4307)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer	2008-04-04 12:02:33 UTC (rev 4308)
@@ -12,3 +12,9 @@
 widget "*.MokoDialerTextview" style "mokodialertextview"
 widget "*.MokoTips*" style "mokodialertextview"
 
+style "dialpad" {
+  engine "moko-engine" {
+    border = TRUE
+  }
+}
+widget_class "*MokoKeypad*" style "dialpad"

Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c	2008-04-03 16:37:21 UTC (rev 4307)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c	2008-04-04 12:02:33 UTC (rev 4308)
@@ -68,6 +68,15 @@
   else
     gc = style->bg_gc[state_type];
 
+  if (MOKO_RC_STYLE (style->rc_style)->has_border)
+  {
+    gdk_draw_rectangle (window, style->dark_gc[state_type], TRUE,
+        x, y, width, height);
+    x += 2;
+    y += 2;
+    width -= 4;
+    height -= 4;
+  }
   gdk_draw_rectangle (window, gc, TRUE, x, y, width, height);
 
 }