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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-09-21 21:40:52 +0200 (Fri, 21 Sep 2007)
New Revision: 3029

Modified:
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
Log:
* data/gtkrc: Add some gradient and border options to styles
* src/moko-draw.c: (moko_draw_box): Implement gradient option


Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog	2007-09-21 19:38:51 UTC (rev 3028)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog	2007-09-21 19:40:52 UTC (rev 3029)
@@ -1,5 +1,10 @@
 2007-09-21  Thomas Wood  <thomas at openedhand.com>
 
+	* data/gtkrc: Add some gradient and border options to styles
+	* src/moko-draw.c: (moko_draw_box): Implement gradient option
+
+2007-09-21  Thomas Wood  <thomas at openedhand.com>
+
 	* src/moko-style.c: (moko_rc_style_merge), (moko_rc_style_parse):
 	* src/moko-style.h:
 

Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc	2007-09-21 19:38:51 UTC (rev 3028)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc	2007-09-21 19:40:52 UTC (rev 3029)
@@ -89,6 +89,7 @@
 {
   engine "moko-engine" {
     border = TRUE
+    gradient = TRUE
   }
 }
 class "GtkButton" style "button"
@@ -102,11 +103,15 @@
 
 style "toolbar"
 {
-	GtkToolbar::internal_padding = 0
+  GtkToolbar::internal_padding = 0
   xthickness = 0
   ythickness = 0
 
   bg[NORMAL] = "#333333"
+  engine "moko-engine" {
+    gradient = TRUE
+    border = FALSE
+  }
 }
 class "GtkToolbar" style "toolbar"
 
@@ -117,6 +122,11 @@
 
   bg[NORMAL] = "#ff7d00"
   bg[PRELIGHT] = "#333333"
+
+  engine "moko-engine" {
+    gradient = TRUE
+    border = FALSE
+  }
 }
 widget_class "*Tool*GtkToggleButton" style "toolitem"
 widget_class "*Tool*GtkButton" style "toolitem"
@@ -130,6 +140,30 @@
 }
 class "GtkNotebook" style "notebook"
 
+style "menu"
+{
+  GtkMenu::vertical-padding = 8
+  GtkMenu::horizontal-padding = 8
+  engine "moko-engine" {
+    gradient = FALSE
+    border = TRUE
+  }
+}
+class "GtkMenu" style "menu"
+
+style "menuitem"
+{
+  xthickness = 8
+  ythickness = 8
+
+  bg[PRELIGHT] = "#ff7d00"
+
+  engine "moko-engine" {
+    gradient = TRUE
+  }
+}
+widget_class "*MenuItem*" style "menuitem"
+
 include "matchboxpanel"
 include "openmoko-calculator"
 include "openmoko-contacts"

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	2007-09-21 19:38:51 UTC (rev 3028)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c	2007-09-21 19:40:52 UTC (rev 3029)
@@ -154,10 +154,15 @@
   }
 
   /*** draw the gradient ***/
-  if (!DETAIL ("menu") && !DETAIL ("trough"))
-   moko_gradient (style, window, state_type, x+1, y+1, width-2, height-2);
+  if (MOKO_RC_STYLE (style->rc_style)->has_gradient)
+  {
+    moko_gradient (style, window, state_type, x, y, width, height);
+  }
+  else
+  {
+    gtk_paint_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  }
 
-
   if (DETAIL ("trough"))
   {
     if (widget && GTK_IS_HSCALE (widget))