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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-11-13 12:08:36 +0100 (Tue, 13 Nov 2007)
New Revision: 3403

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/gtkrc
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
Log:
* data/gtk-2.0/gtkrc: Correct notebook style and remove border form menu items
* src/moko-draw.c: (moko_draw_extension): Use correct colour for background.
Don't draw borders on tabs and don't draw gradients on inactive tabs.


Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog	2007-11-13 10:50:52 UTC (rev 3402)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog	2007-11-13 11:08:36 UTC (rev 3403)
@@ -1,5 +1,13 @@
 2007-11-13  Thomas Wood  <thomas at openedhand.com>
 
+	* data/gtk-2.0/gtkrc: Correct notebook style and remove border form menu
+	items
+	* src/moko-draw.c: (moko_draw_extension): Use correct colour for
+	background. Don't draw borders on tabs and don't draw gradients on
+	inactive tabs.
+
+2007-11-13  Thomas Wood  <thomas at openedhand.com>
+
 	* data/gtk-2.0/gtkrc:
 	 - Ensure everything has a border by default
 	 - Equalise the padding around text entry widgets

Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc	2007-11-13 10:50:52 UTC (rev 3402)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc	2007-11-13 11:08:36 UTC (rev 3403)
@@ -185,12 +185,12 @@
 
   # For notebookes, NORMAL is used for the active tab and ACTIVE is used for
   # ther other tabs
+  bg[NORMAL] = @selected_bg_color
+  fg[NORMAL] = @selected_fg_color
 
   # inactive tabs are in "reversed" colours
+  fg[ACTIVE] = @bg_color
   bg[ACTIVE] = @fg_color
-
-  bg[NORMAL] = @selected_bg_color
-  fg[NORMAL] = @selected_fg_color
 }
 class "GtkNotebook" style "notebook"
 
@@ -222,6 +222,7 @@
 
   engine "moko-engine" {
     gradient = TRUE
+    border = FALSE
   }
 }
 widget_class "*MenuItem*" style "menuitem"

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-11-13 10:50:52 UTC (rev 3402)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c	2007-11-13 11:08:36 UTC (rev 3403)
@@ -435,11 +435,15 @@
 {
 
   GdkGC *gc;
-  gc = moko_gc_new (style->fg_gc[state_type], window);
-  
-  moko_gradient (style, window, state_type, x, y, width, height);
+  gc = moko_gc_new (style->bg_gc[state_type], window);
 
-  gdk_draw_rectangle (window, gc, FALSE, x, y, width - 1, height - 1);
+  /* NORMAL is used for "active" tabs */
+  if (state_type == GTK_STATE_NORMAL)
+    moko_gradient (style, window, state_type, x, y, width, height);
+  else
+    gdk_draw_rectangle (window, gc, TRUE, x, y, width - 1, height - 1);
+
+
   g_object_unref (gc);
 
 }