(no subject)



Hi,

How about a setting for the metacity theme 'main' color.
Something like that mockup:

http://sebdelestaing.free.fr/crap/metacity_mockup.png
(I know this dialog is not HIG compliant but you get the idea).

The patch attached against metacity cvs 01/03/04 already does the
following things:

- Allow themes to specify "user" as a color. (ex:
color="blend/user/0.5")
- Creates a Gconf key /apps/metacity/general/color that holds the
user-defined color. The default value is "gtk:bg[SELECTED]" (that would
be "use system color")
- Patch the stock-themes to be "colorizable".

Apply the patch and go play with the key in gconf-editor you'll get the
idea. The UI is still to be done but I wait for feedback before I go
further into this :-)
The one big drawback of that patch is that newer themes won't be
compatible with older metacity.
It also breaks the theme preview in the theme capplet. I've no idea why
but that should be fixable.

If you are Industrial users you can get a patched version there:
http://sebdelestaing.free.fr/crap/Industrial2.tar.gz

Happy New Year everybody and needless to say... please comment.

Seb
? metacity_user_color.patch
Index: src/main.c
===================================================================
RCS file: /cvs/gnome/metacity/src/main.c,v
retrieving revision 1.54
diff -u -r1.54 main.c
--- src/main.c	22 Dec 2003 00:43:53 -0000	1.54
+++ src/main.c	3 Jan 2004 20:54:29 -0000
@@ -561,6 +561,11 @@
       meta_display_retheme_all ();
       break;
 
+    case META_PREF_COLOR:
+      meta_ui_set_current_theme (meta_prefs_get_theme (), TRUE);
+      meta_display_retheme_all ();
+      break;
+
     default:
       /* handled elsewhere or otherwise */
       break;
Index: src/metacity.schemas.in
===================================================================
RCS file: /cvs/gnome/metacity/src/metacity.schemas.in,v
retrieving revision 1.31
diff -u -r1.31 metacity.schemas.in
--- src/metacity.schemas.in	12 Oct 2003 06:25:38 -0000	1.31
+++ src/metacity.schemas.in	3 Jan 2004 20:54:33 -0000
@@ -110,6 +110,21 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/metacity/general/color</key>
+      <applyto>/apps/metacity/general/color</applyto>
+      <owner>metacity</owner>
+      <type>string</type>
+      <default>gtk:bg[SELECTED]</default>
+      <locale name="C">
+         <short>Theme color</short>
+         <long>
+          The color value determines the base color of window borders, 
+          for theme that support it.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/metacity/general/theme</key>
       <applyto>/apps/metacity/general/theme</applyto>
       <owner>metacity</owner>
Index: src/prefs.c
===================================================================
RCS file: /cvs/gnome/metacity/src/prefs.c,v
retrieving revision 1.45
diff -u -r1.45 prefs.c
--- src/prefs.c	12 Oct 2003 06:25:38 -0000	1.45
+++ src/prefs.c	3 Jan 2004 20:54:36 -0000
@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include "prefs.h"
+#include "theme.h"
 #include "ui.h"
 #include "util.h"
 #ifdef HAVE_GCONF
@@ -44,6 +45,7 @@
 #define KEY_ACTION_DOUBLE_CLICK_TITLEBAR "/apps/metacity/general/action_double_click_titlebar"
 #define KEY_AUTO_RAISE "/apps/metacity/general/auto_raise"
 #define KEY_AUTO_RAISE_DELAY "/apps/metacity/general/auto_raise_delay"
+#define KEY_COLOR "/apps/metacity/general/color"
 #define KEY_THEME "/apps/metacity/general/theme"
 #define KEY_USE_SYSTEM_FONT  "/apps/metacity/general/titlebar_uses_system_font"
 #define KEY_TITLEBAR_FONT "/apps/metacity/general/titlebar_font"
@@ -74,6 +76,7 @@
 static PangoFontDescription *titlebar_font = NULL;
 static MetaVirtualModifier mouse_button_mods = Mod1Mask;
 static MetaFocusMode focus_mode = META_FOCUS_MODE_CLICK;
+static char* current_color = NULL;
 static char* current_theme = NULL;
 static int num_workspaces = 4;
 static MetaActionDoubleClickTitlebar action_double_click_titlebar =
@@ -112,6 +115,7 @@
 static gboolean update_titlebar_font      (const char *value);
 static gboolean update_mouse_button_mods  (const char *value);
 static gboolean update_focus_mode         (const char *value);
+static gboolean update_color              (const char *value);
 static gboolean update_theme              (const char *value);
 static gboolean update_visual_bell        (gboolean v1, gboolean v2);
 static gboolean update_visual_bell_type   (const char *value);
@@ -333,6 +337,11 @@
   cleanup_error (&err);
   update_auto_raise_delay (int_val);
   
+  str_val = gconf_client_get_string (default_client, KEY_COLOR,
+                                     &err);
+  cleanup_error (&err);
+  update_color (str_val);
+  g_free (str_val);
 
   str_val = gconf_client_get_string (default_client, KEY_THEME,
                                      &err);
@@ -482,6 +491,22 @@
       if (update_focus_mode (str))
         queue_changed (META_PREF_FOCUS_MODE);
     }
+  else if (strcmp (key, KEY_COLOR) == 0)
+    {
+      const char *str;
+
+      if (value && value->type != GCONF_VALUE_STRING)
+        {
+          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+                        KEY_COLOR);
+          goto out;
+        }
+      
+      str = value ? gconf_value_get_string (value) : NULL;
+
+      if (update_color (str))
+        queue_changed (META_PREF_COLOR);
+    }
   else if (strcmp (key, KEY_THEME) == 0)
     {
       const char *str;
@@ -827,6 +852,44 @@
 
 #ifdef HAVE_GCONF
 static gboolean
+update_color (const char *value)
+{
+  char *old_color;
+  gboolean changed;
+  
+  old_color = current_color;
+  
+  if (value != NULL && *value)
+    {
+      current_color = g_strdup (value);
+    }
+
+  changed = TRUE;
+  if ((old_color && current_color &&
+       strcmp (old_color, current_color) == 0) ||
+      (old_color == NULL && current_color == NULL))
+    changed = FALSE;
+
+  if (old_color != current_color)
+    g_free (old_color);
+
+  if (current_color == NULL)
+    {
+      /* Fallback crackrock */
+      current_color = g_strdup ("black");
+      changed = TRUE;
+    }
+ 
+// if we don't want libmetacity_private to call meta_prefs_get_color(),
+// then we have to send the new user color value to the library
+  meta_color_set_user_string(current_color);
+
+  return changed;
+}
+#endif /* HAVE_GCONF */
+
+#ifdef HAVE_GCONF
+static gboolean
 update_theme (const char *value)
 {
   char *old_theme;
@@ -877,6 +940,12 @@
   return current_theme;
 }
 
+const char*
+meta_prefs_get_color (void)
+{
+  return current_color;
+}
+
 #ifdef HAVE_GCONF
 static gboolean
 update_use_system_font (gboolean value)
@@ -1288,6 +1357,9 @@
     case META_PREF_FOCUS_MODE:
       return "FOCUS_MODE";
 
+    case META_PREF_COLOR:
+      return "COLOR";
+
     case META_PREF_THEME:
       return "THEME";
 
Index: src/prefs.h
===================================================================
RCS file: /cvs/gnome/metacity/src/prefs.h,v
retrieving revision 1.33
diff -u -r1.33 prefs.h
--- src/prefs.h	12 Oct 2003 06:25:38 -0000	1.33
+++ src/prefs.h	3 Jan 2004 20:54:37 -0000
@@ -33,6 +33,7 @@
   META_PREF_ACTION_DOUBLE_CLICK_TITLEBAR,
   META_PREF_AUTO_RAISE,
   META_PREF_AUTO_RAISE_DELAY,
+  META_PREF_COLOR,
   META_PREF_THEME,
   META_PREF_TITLEBAR_FONT,
   META_PREF_NUM_WORKSPACES,
@@ -62,6 +63,7 @@
 
 MetaVirtualModifier         meta_prefs_get_mouse_button_mods  (void);
 MetaFocusMode               meta_prefs_get_focus_mode         (void);
+const char*                 meta_prefs_get_color              (void);
 const char*                 meta_prefs_get_theme              (void);
 /* returns NULL if GTK default should be used */
 const PangoFontDescription* meta_prefs_get_titlebar_font      (void);
Index: src/theme.c
===================================================================
RCS file: /cvs/gnome/metacity/src/theme.c,v
retrieving revision 1.69
diff -u -r1.69 theme.c
--- src/theme.c	28 Jan 2003 15:07:43 -0000	1.69
+++ src/theme.c	3 Jan 2004 20:54:47 -0000
@@ -22,6 +22,7 @@
 #include <config.h>
 #include "theme.h"
 #include "theme-parser.h"
+#include "prefs.h"
 #include "util.h"
 #include "gradient.h"
 #include <gtk/gtkwidget.h>
@@ -56,6 +57,8 @@
 					 gdouble	 *l,
 					 gdouble	 *s);
 
+static char *user_color = NULL;
+
 static GdkPixbuf *
 colorize_pixbuf (GdkPixbuf *orig,
                  GdkColor  *new_color)
@@ -879,6 +882,15 @@
   g_free (spec);
 }
 
+void
+meta_color_set_user_string(const char *str)
+{
+  if(user_color)
+    g_free(user_color);
+
+  user_color = g_strdup(str);  
+}
+
 MetaColorSpec*
 meta_color_spec_new (MetaColorSpecType type)
 {
@@ -1150,6 +1162,17 @@
       spec->data.shade.factor = factor;
       spec->data.shade.base = base;
     }
+  else if (str[0] == 'u' && str[1] == 's' && str[2] == 'e' && str[3] == 'r')
+    {
+      // we can't do that (or can we ?)     spec = meta_color_spec_new_from_string (meta_prefs_get_color(), err);
+      spec = meta_color_spec_new_from_string (user_color, err);
+      // fail to black
+      if(spec == NULL)
+        {
+          spec = meta_color_spec_new (META_COLOR_SPEC_BASIC);
+          gdk_color_parse ("black", &spec->data.basic.color);
+        }
+    }
   else
     {
       spec = meta_color_spec_new (META_COLOR_SPEC_BASIC);
Index: src/theme.h
===================================================================
RCS file: /cvs/gnome/metacity/src/theme.h,v
retrieving revision 1.36
diff -u -r1.36 theme.h
--- src/theme.h	4 Nov 2002 17:55:56 -0000	1.36
+++ src/theme.h	3 Jan 2004 20:54:49 -0000
@@ -628,6 +628,7 @@
 void           meta_color_spec_render          (MetaColorSpec     *spec,
                                                 GtkWidget         *widget,
                                                 GdkColor          *color);
+void           meta_color_set_user_string(const char *str);
 
 
 MetaDrawOp*    meta_draw_op_new  (MetaDrawType        type);
Index: src/themes/Atlanta/metacity-theme-1.xml
===================================================================
RCS file: /cvs/gnome/metacity/src/themes/Atlanta/metacity-theme-1.xml,v
retrieving revision 1.10
diff -u -r1.10 metacity-theme-1.xml
--- src/themes/Atlanta/metacity-theme-1.xml	17 Nov 2002 11:54:10 -0000	1.10
+++ src/themes/Atlanta/metacity-theme-1.xml	3 Jan 2004 20:54:50 -0000
@@ -175,8 +175,8 @@
 
 <draw_ops name="title_gradient">
   <gradient type="diagonal" x="0" y="0" width="width-SpacerWidth" height="height">
-    <color value="blend/gtk:bg[NORMAL]/gtk:bg[SELECTED]/0.6"/>
-    <color value="gtk:bg[SELECTED]"/>
+    <color value="blend/gtk:bg[NORMAL]/user/0.6"/>
+    <color value="user"/>
   </gradient>
 </draw_ops>
 
Index: src/themes/Bright/metacity-theme-1.xml
===================================================================
RCS file: /cvs/gnome/metacity/src/themes/Bright/metacity-theme-1.xml,v
retrieving revision 1.3
diff -u -r1.3 metacity-theme-1.xml
--- src/themes/Bright/metacity-theme-1.xml	3 Aug 2002 17:02:23 -0000	1.3
+++ src/themes/Bright/metacity-theme-1.xml	3 Jan 2004 20:54:50 -0000
@@ -233,7 +233,7 @@
         x2="width-SpacerWidth+2"
         y2="height-2"
         width="1"/>
-<rectangle color="gtk:bg[SELECTED]" filled="true"
+<rectangle color="user" filled="true"
 	     x="1" y="2" width="width-5" height="height-3"/>
 </draw_ops>
 
Index: src/themes/Crux/metacity-theme-1.xml
===================================================================
RCS file: /cvs/gnome/metacity/src/themes/Crux/metacity-theme-1.xml,v
retrieving revision 1.8
diff -u -r1.8 metacity-theme-1.xml
--- src/themes/Crux/metacity-theme-1.xml	5 Nov 2002 19:38:12 -0000	1.8
+++ src/themes/Crux/metacity-theme-1.xml	3 Jan 2004 20:54:52 -0000
@@ -260,7 +260,7 @@
 <frame_style name="focused" geometry="normal">
   <piece position="left_edge">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-left-border.png" x="0" y="0" width="object_width" height="height"/>
+      <image colorize="user" filename="active-left-border.png" x="0" y="0" width="object_width" height="height"/>
     </draw_ops>
   </piece>
 
@@ -280,21 +280,21 @@
     <draw_ops>
 
       <image filename="active-left-top-border.png" 
-             colorize="gtk:bg[SELECTED]"
+             colorize="user"
              x="0" y="0" width="object_width" height="height"/>
 
       <image filename="active-right-top-border.png" 
              x="width - object_width" y="0" width="object_width" height="height"/>
 
       <image filename="active-top-center-left.png" 
-             colorize="gtk:bg[SELECTED]"
+             colorize="user"
              x="4" y="0" 
              width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min`
                     (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth * height / 22 - 3)" 
              height="height"/>
 
       <image filename="active-top-center-mid-left.png" 
-             colorize="gtk:bg[SELECTED]"
+             colorize="user"
              x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
              y="0" width="object_width * height / 22" height="height"/>
 
@@ -316,14 +316,14 @@
   <piece position="overlay">
     <draw_ops>
       <image filename="active-bottom-left-corner.png" 
-             colorize="gtk:bg[SELECTED]"
+             colorize="user"
              x="0" y="height - object_height" width="object_width" height="object_height"/>
       <image filename="active-bottom-left-border.png" x="5" y="height - object_height" 
-             colorize="gtk:bg[SELECTED]"
+             colorize="user"
              width="((title_width + height / 2 - 4) `min` (width - object_width - 26))"
              height="object_height"/>
       <image filename="active-bottom-mid-left-border.png" 
-             colorize="gtk:bg[SELECTED]"
+             colorize="user"
              x="((title_width + height / 2) `min` (width - object_width - 6)) + 1" 
              y="height - object_height" width="object_width" height="object_height"/>
       <image filename="active-bottom-mid-right-border.png" 
@@ -407,18 +407,18 @@
 
   <button function="menu" state="normal">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
+      <image colorize="user" filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-pressed.png" x="0" y="0" width="width" height="height"/>
+      <image colorize="user" filename="active-menu-button-pressed.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
   <button function="menu" state="prelight">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-prelight.png" x="0" y="0" width="width" height="height"/>
+      <image colorize="user" filename="active-menu-button-prelight.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 </frame_style>
@@ -451,7 +451,7 @@
 <frame_style name="focused_shaded" geometry="normal" parent="focused">
   <piece position="left_titlebar_edge">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-left-top-border-shaded.png" x="0" y="3" width="object_width" height="object_height"/>
+      <image colorize="user" filename="active-left-top-border-shaded.png" x="0" y="3" width="object_width" height="object_height"/>
     </draw_ops>
   </piece>
   <piece position="right_titlebar_edge">
@@ -491,14 +491,14 @@
   <piece position="titlebar">
     <draw_ops>
       <image filename="active-top-left-corner.png" 
-             colorize="gtk:bg[SELECTED]"
+             colorize="user"
              x="0" y="0" width="object_width" height="object_height"/>
       <image filename="active-border-top-left-border.png" 
-             colorize="gtk:bg[SELECTED]" x="5" y="0"
+             colorize="user" x="5" y="0"
              width="((title_width + height / 2 - 4) `min` (width - object_width - 26))"
              height="object_height"/>
       <image filename="active-top-mid-left-border.png" 
-             colorize="gtk:bg[SELECTED]"
+             colorize="user"
              x="((title_width + height / 2) `min` (width - object_width - 6)) + 1" 
              y="0" width="object_width" height="object_height"/>
       <image filename="active-top-mid-right-border.png" 
Index: src/themes/Metabox/metacity-theme-1.xml
===================================================================
RCS file: /cvs/gnome/metacity/src/themes/Metabox/metacity-theme-1.xml,v
retrieving revision 1.2
diff -u -r1.2 metacity-theme-1.xml
--- src/themes/Metabox/metacity-theme-1.xml	9 Jun 2003 18:56:28 -0000	1.2
+++ src/themes/Metabox/metacity-theme-1.xml	3 Jan 2004 20:54:54 -0000
@@ -67,8 +67,8 @@
 
 	<draw_ops name="bg_active">
 		<gradient type="vertical" x="0" y="0" width="width" height="height">
-			<color value="shade/gtk:bg[SELECTED]/1.25"/>
-			<color value="shade/gtk:bg[SELECTED]/0.85"/>
+			<color value="shade/user/1.25"/>
+			<color value="shade/user/0.85"/>
 		</gradient>
 	</draw_ops>
 
@@ -99,24 +99,24 @@
 
 	<draw_ops name="button_pressed_bg">
 		<gradient type="vertical" x="0" y="0" width="width" height="height" alpha="0.25">
-			<color value="shade/gtk:bg[SELECTED]/0.75"/>
-			<color value="shade/gtk:bg[SELECTED]/0.5"/>
+			<color value="shade/user/0.75"/>
+			<color value="shade/user/0.5"/>
 		</gradient>
 	</draw_ops>
 
 	<draw_ops name="button_prelight_bg">
 		<gradient type="vertical" x="0" y="0" width="width" height="height" alpha="0.25">
-			<color value="shade/gtk:bg[SELECTED]/2.0"/>
-			<color value="shade/gtk:bg[SELECTED]/1.5"/>
+			<color value="shade/user/2.0"/>
+			<color value="shade/user/1.5"/>
 		</gradient>
 	</draw_ops>
 
 	<draw_ops name="menu_button">
 		<include name="bg_button_active"/>
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75" width="2" x1="ButtonIPad+1" y1="width/2+2" x2="(width-ButtonIPad)/2+1" y2="width/2+2"/>
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75" width="2" x1="ButtonIPad+1" y1="width/2-2" x2="(width-ButtonIPad)/2+1" y2="width/2-2"/>
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75" width="2" x1="width-ButtonIPad-1" y1="width/2+2" x2="width-(width-ButtonIPad)/2-1" y2="width/2+2"/>
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75" width="2" x1="width-ButtonIPad-1" y1="width/2-2" x2="width-(width-ButtonIPad)/2-1" y2="width/2-2"/>
+		<line color="blend/user/gtk:fg[SELECTED]/0.75" width="2" x1="ButtonIPad+1" y1="width/2+2" x2="(width-ButtonIPad)/2+1" y2="width/2+2"/>
+		<line color="blend/user/gtk:fg[SELECTED]/0.75" width="2" x1="ButtonIPad+1" y1="width/2-2" x2="(width-ButtonIPad)/2+1" y2="width/2-2"/>
+		<line color="blend/user/gtk:fg[SELECTED]/0.75" width="2" x1="width-ButtonIPad-1" y1="width/2+2" x2="width-(width-ButtonIPad)/2-1" y2="width/2+2"/>
+		<line color="blend/user/gtk:fg[SELECTED]/0.75" width="2" x1="width-ButtonIPad-1" y1="width/2-2" x2="width-(width-ButtonIPad)/2-1" y2="width/2-2"/>
 	</draw_ops>
 
 	<draw_ops name="menu_button_pressed">
@@ -139,7 +139,7 @@
 
 	<draw_ops name="minimize_button">
 		<include name="bg_button_active"/>
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75"
+		<line color="blend/user/gtk:fg[SELECTED]/0.75"
 			x1="ButtonIPad"
 			y1="height - ButtonIPad - ThickLineWidth + 1"
 			x2="width - ButtonIPad"
@@ -169,9 +169,9 @@
 
 	<draw_ops name="maximize_button">
 		<include name="bg_button_active"/>
-		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75" filled="false"
+		<rectangle color="blend/user/gtk:fg[SELECTED]/0.75" filled="false"
 			x="ButtonIPad" y="ButtonIPad" width="width-ButtonIPad*2-1" height="height-ButtonIPad*2-1"/>
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75" width="3"
+		<line color="blend/user/gtk:fg[SELECTED]/0.75" width="3"
 			x1="ButtonIPad" y1="ButtonIPad+1" x2="width-ButtonIPad" y2="ButtonIPad+1"/>
 	</draw_ops>
 
@@ -194,11 +194,11 @@
 	</draw_ops>
 
 	<draw_ops name="mini_window_icon">
-		<rectangle color="gtk:bg[SELECTED]" filled="true"
+		<rectangle color="user" filled="true"
 			x="0" y="0" width="width-1" height="height-1"/>
-		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75" filled="false"
+		<rectangle color="blend/user/gtk:fg[SELECTED]/0.75" filled="false"
 			x="0" y="0" width="width-1" height="height-1"/>
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75" width="2"
+		<line color="blend/user/gtk:fg[SELECTED]/0.75" width="2"
 			x1="0" y1="1" x2="width" y2="1"/>
 	</draw_ops>
 
@@ -251,12 +251,12 @@
                 <clip x="ButtonIPad" y="ButtonIPad" 
                         width="width - ButtonIPad - 4" 
                         height="height - ButtonIPad - 4"/>
-                <line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75"
+                <line color="blend/user/gtk:fg[SELECTED]/0.75"
 			width="2" 
 			x1="ButtonIPad" y1="ButtonIPad"
 			x2="width - ButtonIPad" y2="height - ButtonIPad"/>
 		
-                <line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.75"
+                <line color="blend/user/gtk:fg[SELECTED]/0.75"
 			width="2"
     	                x1="ButtonIPad" y1="height - ButtonIPad - 1"
 			x2="width - ButtonIPad" y2="ButtonIPad - 1"/>
Index: src/themes/Simple/metacity-theme-1.xml
===================================================================
RCS file: /cvs/gnome/metacity/src/themes/Simple/metacity-theme-1.xml,v
retrieving revision 1.2
diff -u -r1.2 metacity-theme-1.xml
--- src/themes/Simple/metacity-theme-1.xml	31 Jan 2003 03:44:05 -0000	1.2
+++ src/themes/Simple/metacity-theme-1.xml	3 Jan 2004 20:54:55 -0000
@@ -154,8 +154,8 @@
 </draw_ops>
 
 <draw_ops name="title_tile">
-  <line color="gtk:bg[SELECTED]" x1="0" y1="0" x2="width" y2="0"/>
-  <line color="blend/gtk:bg[SELECTED]/#000000/0.1" x1="0" y1="1" x2="width" y2="1"/>
+  <line color="user" x1="0" y1="0" x2="width" y2="0"/>
+  <line color="blend/user/#000000/0.1" x1="0" y1="1" x2="width" y2="1"/>
 </draw_ops>
 
 <draw_ops name="title_tile_unfocused">
@@ -165,7 +165,7 @@
 
 <draw_ops name="title_bg">
   <tile name="title_tile" tile_width="width" tile_height="2" x="0" y="0" width="width" height="height"/>
-  <rectangle color="blend/gtk:bg[SELECTED]/#000000/0.6" filled="false" x="0" y="0" width="width-1" height="height-1"/>
+  <rectangle color="blend/user/#000000/0.6" filled="false" x="0" y="0" width="width-1" height="height-1"/>
   <rectangle color="blend/#000000/gtk:bg[NORMAL]/0.5" filled="true" x="0" y="0" width="1" height="1"/>
   <rectangle color="blend/#000000/gtk:bg[NORMAL]/0.5" filled="true" x="width-1" y="0" width="1" height="1"/>
   <rectangle color="blend/#000000/gtk:bg[NORMAL]/0.5" filled="true" x="0" y="height-1" width="1" height="1"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]