Changeset 3611

Timestamp:

12/07/07 15:06:28 (6 years ago)

Author:

thomas

Message:

• 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)

Location:

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine

Files:

• ChangeLog (modified) (1 diff)
• data/gtk-2.0/gtkrc (modified) (1 diff)
• src/moko-draw.c (modified) (1 diff)
• src/moko-utils.c (modified) (1 diff)

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog

@@ +1 @@
+2007-12-07  Thomas Wood  <thomas@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@openedhand.com>
 

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc

@@ -15 +15 @@
 
 # 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"

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c

@@ -103 +103 @@
 
   /* 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 */

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-utils.c

@@ -111 +111 @@
   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);