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

thomas at sita.openmoko.org thomas at sita.openmoko.org
Fri Dec 7 15:06:30 CET 2007


Author: thomas
Date: 2007-12-07 15:06:28 +0100 (Fri, 07 Dec 2007)
New Revision: 3611

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
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-utils.c
Log:
* src/moko-draw.c: (moko_gradient):
* src/moko-utils.c: (moko_shade_colour):
Change how shading operates to allow shading up from black.

* data/gtk-2.0/gtkrc:
Change the default fg colour to black (used as bg colour in some
widgets, e.g. toolbars)


Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog	2007-12-07 01:13:30 UTC (rev 3610)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog	2007-12-07 14:06:28 UTC (rev 3611)
@@ -1,3 +1,13 @@
+2007-12-07  Thomas Wood  <thomas at openedhand.com>
+
+	* src/moko-draw.c: (moko_gradient):
+	* src/moko-utils.c: (moko_shade_colour):
+	Change how shading operates to allow shading up from black.
+
+	* data/gtk-2.0/gtkrc:
+	Change the default fg colour to black (used as bg colour in some
+	widgets, e.g. toolbars)
+
 2007-11-14  Thomas Wood  <thomas at openedhand.com>
 
 	* data/gtk-2.0/gtkrc: Minor colour tweaks. Lighten the normal background

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-12-07 01:13:30 UTC (rev 3610)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc	2007-12-07 14:06:28 UTC (rev 3611)
@@ -14,7 +14,7 @@
 gtk-icon-sizes = "gtk-button=32,32:gtk-small-toolbar=48,48:gtk-large-toolbar=48,48"
 
 # Set the default gtk-color-scheme property
-gtk_color_scheme = "fg_color:#333;bg_color:#f4f0f4;base_color:#fff;text_color:#000;selected_bg_color:#ff7d00;selected_fg_color:#000"
+gtk_color_scheme = "fg_color:#000;bg_color:#f4f0f4;base_color:#fff;text_color:#000;selected_bg_color:#ff7d00;selected_fg_color:#000"
 
 style "default"
 {

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-12-07 01:13:30 UTC (rev 3610)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c	2007-12-07 14:06:28 UTC (rev 3611)
@@ -102,10 +102,10 @@
   gc = gdk_gc_new (window);
 
   /* get the start and end colours */
-  moko_shade_colour (&style->bg[state_type], &c1, 1.8);
-  moko_shade_colour (&style->bg[state_type], &c2, 1.4);
-  moko_shade_colour (&style->bg[state_type], &c3, 1.3);
-  moko_shade_colour (&style->bg[state_type], &c4, 1.0);
+  moko_shade_colour (&style->bg[state_type], &c1, 0.8);
+  moko_shade_colour (&style->bg[state_type], &c2, 0.4);
+  moko_shade_colour (&style->bg[state_type], &c3, 0.3);
+  moko_shade_colour (&style->bg[state_type], &c4, 0.0);
 
   /* set line for 1px */
   gdk_gc_set_line_attributes (gc, 1, GDK_LINE_SOLID, GDK_CAP_BUTT,

Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-utils.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-utils.c	2007-12-07 01:13:30 UTC (rev 3610)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-utils.c	2007-12-07 14:06:28 UTC (rev 3611)
@@ -110,18 +110,18 @@
 
   color_to_hlsx (&_src, &h, &l, &s);
 
-  l = CFX_MUL (l, shade);
+  l = l + CFX_MUL (CFX_ONE - l, shade);
   if (l > CFX_ONE)
     l = CFX_ONE;
   else if (l < 0)
     l = 0;
-
-  s = CFX_MUL (s, shade);
+/*
+  s = s + CFX_MUL (CFX_ONE - s, shade);
   if (s > CFX_ONE)
     s = CFX_ONE;
   else if (s < 0)
     s = 0;
-  
+*/
   color_from_hlsx (dest, h, l, s);
 
   /* convert back to 16 bit per channel */





More information about the commitlog mailing list