[gnome-themes-standard/wip/highcontrast-wm] First attempt at highcontrast WM theme

From: Cosimo Cecchi <cosimoc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-themes-standard/wip/highcontrast-wm] First attempt at highcontrast WM theme
Date: Thu, 20 Sep 2012 03:18:21 +0000 (UTC)
commit 14f619ea9ad8c96f110b4f81d14ba13d216c8515
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Sep 19 23:02:54 2012 -0400

    First attempt at highcontrast WM theme

 themes/HighContrast/gtk-3.0/gtk.css                |    5 +
 .../HighContrast/metacity-1/metacity-theme-3.xml   |  270 +++++++++++--------
 2 files changed, 161 insertions(+), 114 deletions(-)
---
diff --git a/themes/HighContrast/gtk-3.0/gtk.css b/themes/HighContrast/gtk-3.0/gtk.css
index ed028e6..469d5ef 100644
--- a/themes/HighContrast/gtk-3.0/gtk.css
+++ b/themes/HighContrast/gtk-3.0/gtk.css
@@ -63,6 +63,11 @@
 
 @define-color theme_cursor_color @theme_fg_color;
 
+ define-color wm_button_bg @theme_button_bg;
+ define-color wm_button_fg @theme_button_fg;
+ define-color wm_button_prelight_bg @theme_fg_color;
+ define-color wm_button_prelight_fg @theme_base_color;
+
 * {
     /* Pidgin */
     -GtkIMHtml-hyperlink-color: #000060;
diff --git a/themes/HighContrast/metacity-1/metacity-theme-3.xml b/themes/HighContrast/metacity-1/metacity-theme-3.xml
index 27701d8..281c388 100644
--- a/themes/HighContrast/metacity-1/metacity-theme-3.xml
+++ b/themes/HighContrast/metacity-1/metacity-theme-3.xml
@@ -11,17 +11,15 @@
 <!-- meaningfull constants -->
 
 <constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
+<constant name="C_border_prelight" value="#000000" />
 <constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
 <constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
 <constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
-<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
-<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
+<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.7" />
 <!-- color of the button icons -->
-<constant name="C_icons_focused" value="gtk:text[SELECTED]" />
-<constant name="C_icons_focused_pressed" value="#ffffff" />
-<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
+<constant name="C_icons_focused" value="gtk:custom(wm_button_fg,gtk:text[NORMAL])" />
+<constant name="C_icons_focused_prelight" value="gtk:custom(wm_button_prelight_fg,#ffffff)" />
+<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.7" />
 <constant name="C_icons_unfocused_prelight" value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.3" />
 <constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
 <constant name="D_icons_unfocused_offset" value="2" /> <!-- offset of the unfocused icons -->
@@ -118,28 +116,10 @@
 <draw_ops name="title_focused">
 	<title version="< 3.1"
                x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title version="< 3.1"
-               x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2))"
-               color="C_title_focused_hilight_dark" />
-	<title version="< 3.1"
-               x="(0 `max` ((width - title_width) / 2)) + 2"
                y="(0 `max` ((height - title_height) / 2)) + 1"
                color="C_title_focused" />
 	<title version=">= 3.1"
                x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2))"
-               ellipsize_width="width"
-               color="C_title_focused_hilight_dark" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
                y="(0 `max` ((height - title_height) / 2)) + 1"
                ellipsize_width="width"
                color="C_title_focused" />
@@ -179,37 +159,16 @@
 	<rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" />
 </draw_ops>
 
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-	<arc color="C_titlebar_focused_hilight" x="1" y="1" width="7" height="7"  start_angle="270" extent_angle="90" />
-	<arc color="C_titlebar_focused_hilight" x="width-10" y="1" width="9" height="7"  start_angle="0" extent_angle="90" />
-	<gradient type="vertical" x="1" y="5" width="1" height="height-9">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
 <draw_ops name="titlebar_focused">
 	<include name="titlebar_fill_focused" />
-	<include name="hilight" />
 </draw_ops>
 
 <draw_ops name="rounded_titlebar_focused">
 	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
 </draw_ops>
 
 <draw_ops name="rounded_titlebar_focused_alt">
 	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
 </draw_ops>
 
 <draw_ops name="border_focused">
@@ -276,8 +235,6 @@
 
 	<!-- button icons-->
 
-<constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-
 <draw_ops name="close_glyph_focused">
 	<line
 		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
@@ -305,42 +262,43 @@
 		color="C_icons_focused" />
 </draw_ops>
 
-<draw_ops name="close_shadow_focused">
+<draw_ops name="close_glyph_focused_prelight">
 	<line
 		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
 		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow" 
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 	<line
 		x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
 		x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 	<line 
 		x1="(width-width%3)/3+D_icons_shrink-D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
 		x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 	<line 
 		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
 		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 	<line 
 		x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
 		x2="(width-width%3)/3+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 	<line 
 		x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow" y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
 		x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="close_focused">
-	<include name="close_shadow_focused" y="1" />
-	<!-- I'm not happy with the current aa I'll draw it twice to make it darker -->
-	<include name="close_shadow_focused" y="1" />
 	<include name="close_glyph_focused" />
 </draw_ops>
 
+<draw_ops name="close_focused_prelight">
+	<include name="close_glyph_focused_prelight" />
+</draw_ops>
+
 <draw_ops name="close_focused_pressed">
-	<include name="close_glyph_focused" y="1" />
+	<include name="close_glyph_focused_prelight" y="1" />
 </draw_ops>
 
 <draw_ops name="close_glyph_unfocused">
@@ -450,24 +408,27 @@
 		color="C_icons_focused" />
 </draw_ops>
 
-<draw_ops name="maximize_shadow_focused">
+<draw_ops name="maximize_glyph_focused_prelight">
 	<rectangle 
 		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
 		width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 	<rectangle 
 		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
 		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="maximize_focused">
-	<include name="maximize_shadow_focused" y="1" />
 	<include name="maximize_glyph_focused" />
 </draw_ops>
 
+<draw_ops name="maximize_focused_prelight">
+	<include name="maximize_glyph_focused_prelight" />
+</draw_ops>
+
 <draw_ops name="maximize_focused_pressed">
-	<include name="maximize_glyph_focused" y="1" />
+	<include name="maximize_glyph_focused_prelight" y="1" />
 </draw_ops>
 
 <draw_ops name="maximize_glyph_unfocused">
@@ -522,20 +483,23 @@
 		color="C_icons_focused" />
 </draw_ops>
 
-<draw_ops name="minimize_shadow_focused">
+<draw_ops name="minimize_glyph_focused_prelight">
 	<rectangle 
 		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
 		width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="minimize_focused">
-	<include name="minimize_shadow_focused" y="1" />
 	<include name="minimize_glyph_focused" />
 </draw_ops>
 
+<draw_ops name="minimize_focused_prelight">
+	<include name="minimize_glyph_focused_prelight" />
+</draw_ops>
+
 <draw_ops name="minimize_focused_pressed">
-	<include name="minimize_glyph_focused" y="1" />
+	<include name="minimize_glyph_focused_prelight" y="1" />
 </draw_ops>
 
 <draw_ops name="minimize_glyph_unfocused">
@@ -586,28 +550,31 @@
 		color="C_icons_focused" />
 </draw_ops>
 
-<draw_ops name="menu_shadow_focused">
+<draw_ops name="menu_glyph_focused_prelight">
 	<rectangle 
 		x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
 		width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 	<rectangle 
 		x="(width-width%3)/3+2+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow" 
 		width="width-2*(width-width%3)/3-5-2*D_icons_shrink+2*D_icons_grow" height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow" 
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 	<rectangle 
 		x="(width-width%3)/3+4+D_icons_shrink-D_icons_grow" y="height/2-1-D_icons_shrink+D_icons_grow" 
 		width="width-2*(width-width%3)/3-8-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="menu_focused">
-	<include name="menu_shadow_focused" y="1" />
 	<include name="menu_glyph_focused" />
 </draw_ops>
 
+<draw_ops name="menu_focused_prelight">
+	<include name="menu_glyph_focused_prelight" />
+</draw_ops>
+
 <draw_ops name="menu_focused_pressed">
-	<include name="menu_glyph_focused" y="1" />
+	<include name="menu_glyph_focused_prelight" y="1" />
 </draw_ops>
 
 <draw_ops name="menu_glyph_unfocused">
@@ -686,24 +653,35 @@
 		color="C_icons_focused" />
 </draw_ops>
 
-<draw_ops name="shade_shadow_focused">
+<draw_ops name="shade_glyph_focused_prelight">
 	<rectangle 
 		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+D_icons_shrink-D_icons_grow" 
 		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
 	<rectangle 
 		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow" 
 		width="width-2*(width-width%3)/3-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
-		color="C_icons_shadow" />
+		color="C_icons_focused_prelight" />
+	<rectangle 
+		x="(width-width%3)/3+D_icons_shrink-D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
+		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
+		color="C_icons_focused_prelight" />
+	<rectangle 
+		x="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow" y="(height-height%3)/3+3+D_icons_shrink-D_icons_grow" 
+		width="2" height="height-2*(height-height%3)/3-6-D_icons_shrink+D_icons_grow" filled="true"
+		color="C_icons_focused_prelight" />
 </draw_ops>
 
 <draw_ops name="shade_focused">
-	<include name="shade_shadow_focused" y="1" />
 	<include name="shade_glyph_focused" />
 </draw_ops>
 
+<draw_ops name="shade_focused_prelight">
+	<include name="shade_glyph_focused_prelight" />
+</draw_ops>
+
 <draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
+	<include name="shade_glyph_focused_prelight" y="1" />
 </draw_ops>
 
 <draw_ops name="shade_glyph_unfocused">
@@ -778,21 +756,29 @@
 
 	<!-- button backgrounds -->
 
-<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-<constant name="C_button_hilight" value="gtk:custom(wm_highlight,blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6)" />
+<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
+<constant name="C_button_border_prelight" value="#000000" />
 
 <draw_ops name="button_fill"> <!-- button background gradient -->
+       <gradient type="vertical" x="0" y="0" width="width" height="height-2">
+               <color value="gtk:custom(wm_button_bg,gtk:bg[NORMAL])" />
+               <color value="gtk:custom(wm_button_bg,gtk:bg[NORMAL])" />
+       </gradient>
+</draw_ops>
+
+<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status -->
 	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
-		<color value="gtk:custom(wm_button_bg_a,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.15)" />
-		<color value="gtk:custom(wm_button_bg_b,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.21)" />
-		<color value="gtk:custom(wm_button_bg_c,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.27)" />
-		<color value="gtk:custom(wm_button_bg_d,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.12)" />
+               <color value="gtk:custom(wm_button_prelight_bg,#000000)" />
+               <color value="gtk:custom(wm_button_prelight_bg,#000000)" />
 	</gradient>
 </draw_ops>
 
 <draw_ops name="button_bottom">
 	<line x1="0" y1="height-2" x2="width-1" y2="height-2" color="C_button_border" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_button_hilight" />
+</draw_ops>
+
+<draw_ops name="button_bottom_prelight">
+	<line x1="0" y1="height-2" x2="width-1" y2="height-2" color="C_button_border_prelight" />
 </draw_ops>
 
 <draw_ops name="button_bevel">
@@ -806,20 +792,14 @@
 	</gradient>
 </draw_ops>
 
-<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status -->
-	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
-		<color value="gtk:custom(wm_button_bg_hover_a,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03)" />
-		<color value="gtk:custom(wm_button_bg_hover_b,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1)" />
-		<color value="gtk:custom(wm_button_bg_hover_c,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.2)" />
-		<color value="gtk:custom(wm_button_bg_hover_d,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.04)" />
+<draw_ops name="button_bevel_prelight">
+	<gradient type="vertical" x="0" y="0" width="1" height="height-2">
+		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.1"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
 	</gradient>
-</draw_ops>
-
-<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status -->
-	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
-		<color value="gtk:custom(wm_button_bg_active_a,blend/#000000/gtk:bg[NORMAL]/0.7)" />
-		<color value="gtk:custom(wm_button_bg_active_b,blend/#000000/gtk:bg[NORMAL]/0.75)" />
-		<color value="gtk:custom(wm_button_bg_active_c,blend/#000000/gtk:bg[NORMAL]/0.8)" />
+	<gradient type="vertical" x="width-1" y="0" width="1" height="height-2">
+		<color value="C_border_prelight"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
 	</gradient>
 </draw_ops>
 
@@ -831,13 +811,14 @@
 
 <draw_ops name="button_prelight">
 	<include name="button_fill_prelight" />
-	<include name="button_bevel" />
-	<include name="button_bottom" />
+	<include name="button_bevel_prelight" />
+	<include name="button_bottom_prelight" />
 </draw_ops>
 
 <draw_ops name="button_pressed">
-	<include name="button_fill_pressed" />
-	<include name="button_bottom" />
+	<include name="button_fill_prelight" />
+	<include name="button_bevel_prelight" />
+	<include name="button_bottom_prelight" />
 </draw_ops>
 
 <!-- things get messy here -->
@@ -914,14 +895,12 @@
 	<include name="button_inner_right_slice4_pressed" />
 </draw_ops>
 
-
 <draw_ops name="button_inner_right_border">
 	<gradient type="vertical" x="0" y="0" width="1" height="height-5">
 		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
 		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
 		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
 	</gradient>
-	<arc color="C_button_hilight" x="1" y="height-10" width="9" height="9"  start_angle="180" extent_angle="90" />
 	<gradient type="vertical" x="1" y="0" width="1" height="height-5">
 		<color value="C_border_focused" />
 		<color value="C_button_border" />
@@ -929,6 +908,19 @@
 	<arc color="C_button_border" x="1" y="height-11" width="9" height="9"  start_angle="180" extent_angle="90" />
 </draw_ops>
 
+<draw_ops name="button_inner_right_border_prelight">
+	<gradient type="vertical" x="0" y="0" width="1" height="height-5">
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
+	</gradient>
+	<gradient type="vertical" x="1" y="0" width="1" height="height-5">
+		<color value="C_border_prelight" />
+		<color value="C_button_border_prelight" />
+	</gradient>
+	<arc color="C_button_border_prelight" x="1" y="height-11" width="9" height="9"  start_angle="180" extent_angle="90" />
+</draw_ops>
+
 <draw_ops name="button_inner_right">
 	<include name="button_inner_right_fill" />
 	<include name="button_inner_right_border" />
@@ -936,12 +928,12 @@
 
 <draw_ops name="button_inner_right_prelight">
 	<include name="button_inner_right_fill_prelight" />
-	<include name="button_inner_right_border" />
+	<include name="button_inner_right_border_prelight" />
 </draw_ops>
 
 <draw_ops name="button_inner_right_pressed">
 	<include name="button_inner_right_fill_pressed" />
-	<include name="button_inner_right_border" />
+	<include name="button_inner_right_border_prelight" />
 </draw_ops>
 
 <draw_ops name="button_inner_left_slice1">
@@ -1016,13 +1008,15 @@
 	<include name="button_inner_left_slice4_pressed" />
 </draw_ops>
 
+<draw_ops name="button_inner_left_border_prelight">
+	<gradient type="vertical" x="width-2" y="0" width="1" height="height-5">
+		<color value="C_border_prelight" />
+		<color value="C_button_border_prelight" />
+	</gradient>
+	<arc color="C_button_border_prelight" x="width-11" y="height-11" width="9" height="9"  start_angle="90" extent_angle="90" />
+</draw_ops>
 
 <draw_ops name="button_inner_left_border">
-	<gradient type="vertical" x="width-1" y="0" width="1" height="height-6">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="C_button_hilight" />
-	</gradient>
-	<arc color="C_button_hilight" x="width-11" y="height-11" width="10" height="10"  start_angle="90" extent_angle="90" />
 	<gradient type="vertical" x="width-2" y="0" width="1" height="height-5">
 		<color value="C_border_focused" />
 		<color value="C_button_border" />
@@ -1037,12 +1031,12 @@
 
 <draw_ops name="button_inner_left_prelight">
 	<include name="button_inner_left_fill_prelight" />
-	<include name="button_inner_left_border" />
+	<include name="button_inner_left_border_prelight" />
 </draw_ops>
 
 <draw_ops name="button_inner_left_pressed">
 	<include name="button_inner_left_fill_pressed" />
-	<include name="button_inner_left_border" />
+	<include name="button_inner_left_border_prelight" />
 </draw_ops>
 
 <!-- frame styles -->
@@ -1053,16 +1047,22 @@
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="rounded_border_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
+	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
 	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
 	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
 	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
 	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
 	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
 	<button function="shade" state="normal" draw_ops="shade_focused" />
+	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
 	<button function="unshade" state="normal" draw_ops="shade_focused" />
+	<button function="unshade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
 
 	<button function="left_middle_background" state="normal" draw_ops="button"/>
@@ -1134,16 +1134,22 @@
 	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
 	<piece position="title" draw_ops="title_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
+	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="prelight" draw_ops="maximize_focused" />
 	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
 	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
 	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
 	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
 	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
 	<button function="shade" state="normal" draw_ops="shade_focused" />
+	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
 	<button function="unshade" state="normal" draw_ops="shade_focused" />
+	<button function="unshade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
 
 	<button function="left_middle_background" state="normal" draw_ops="button"/>
@@ -1215,16 +1221,22 @@
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
 	<button function="close" state="normal" draw_ops="close_focused" />
+	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
 	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
 	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
 	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
 	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
 	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
 	<button function="shade" state="normal" draw_ops="shade_focused" />
+	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
 	<button function="unshade" state="normal" draw_ops="shade_focused" />
+	<button function="unshade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
 
 	<button function="left_middle_background" state="normal" draw_ops="button"/>
@@ -1297,16 +1309,22 @@
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="rounded_border_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
+	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
 	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
 	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
 	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
 	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
 	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
 	<button function="shade" state="normal" draw_ops="shade_focused" />
+	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
 	<button function="unshade" state="normal" draw_ops="shade_focused" />
+	<button function="unshade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
 
 	<button function="left_middle_background" state="normal" draw_ops="button"/>
@@ -1377,16 +1395,22 @@
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
+	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
 	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
 	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
 	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
 	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
 	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
 	<button function="shade" state="normal" draw_ops="shade_focused" />
+	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
 	<button function="unshade" state="normal" draw_ops="shade_focused" />
+	<button function="unshade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
 
 	<button function="left_middle_background" state="normal" draw_ops="button"/>
@@ -1458,16 +1482,22 @@
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
+	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
 	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
 	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
 	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
 	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
 	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
 	<button function="shade" state="normal" draw_ops="shade_focused" />
+	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
 	<button function="unshade" state="normal" draw_ops="shade_focused" />
+	<button function="unshade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
 
 	<button version="< 3.3" function="left_middle_background" state="normal" draw_ops="button_inner_left"/>
@@ -1669,16 +1699,22 @@
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="border_right_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
+	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
 	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
 	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
 	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
 	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
 	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
 	<button function="shade" state="normal" draw_ops="shade_focused" />
+	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
 	<button function="unshade" state="normal" draw_ops="shade_focused" />
+	<button function="unshade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
 
 	<button function="left_middle_background" state="normal" draw_ops="button"/>
@@ -1751,16 +1787,22 @@
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="border_left_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
+	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
 	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
 	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
 	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
 	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
 	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
 	<button function="shade" state="normal" draw_ops="shade_focused" />
+	<button function="shade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
 	<button function="unshade" state="normal" draw_ops="shade_focused" />
+	<button function="unshade" state="prelight" draw_ops="shade_focused_prelight" />
 	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
 
 	<button function="left_middle_background" state="normal" draw_ops="button"/>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]