[gnome-themes-standard] Window decorations: more evident buttonr prelight effect.

From: Lapo Calamandrei <lapo src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-themes-standard] Window decorations: more evident buttonr prelight effect.
Date: Fri, 19 Nov 2010 13:55:18 +0000 (UTC)
commit 07b31fe247d09023df2738a6466759ae9ec331ce
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri Nov 19 14:55:10 2010 +0100

    Window decorations: more evident buttonr prelight effect.

 themes/Adwaita/metacity-1/metacity-theme-2.xml |  101 +++++++++++++++++-------
 themes/Adwaita/metacity-1/metacity-theme-3.xml |  103 +++++++++++++++++-------
 2 files changed, 147 insertions(+), 57 deletions(-)
---
diff --git a/themes/Adwaita/metacity-1/metacity-theme-2.xml b/themes/Adwaita/metacity-1/metacity-theme-2.xml
index 5fe54b2..8b3b4af 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-2.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-2.xml
@@ -232,7 +232,7 @@
 		<gradient type="vertical" x="0" y="0" width="width" height="height - 3">
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.10"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.12"/>
+			<color value="blend/gtk:bg[SELECTED]/gtk:bg[NORMAL]/0.65"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
 		</gradient>
 		<include name="button_separator" />
@@ -401,16 +401,8 @@
   <!-- on unfocused window -->
 
   <!-- Close Buttons -->
-	<draw_ops name="icon_close">
-		<!-- shadow -->
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
 
-		<!-- glyph -->
+	<draw_ops name="icon_close_glyph">
 		<line color="CIconFocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
 		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-3" />
 		<line color="CIconFocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-2" />
@@ -419,6 +411,34 @@
 		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-2" />
 	</draw_ops>
 
+	<draw_ops name="icon_close_shadow">
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
+
+	</draw_ops>
+
+
+	<draw_ops name="icon_close">
+		<include name="icon_close_shadow" />
+		<include name="icon_close_glyph" />
+	</draw_ops>
+
+	<draw_ops name="icon_close_prelight">
+		<!-- shadow -->
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
+		<include name="icon_close_glyph" />
+	</draw_ops>
+
+
 	<draw_ops name="icon_close_single">
 		<!-- shadow -->
 		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-1" />
@@ -472,20 +492,32 @@
 
   <!-- Maximize Buttons -->
 	<!-- !!!metacity actually draws rectagles 1px bigger then what is set!!! (that's the cause of the "-1"s in dimensions) -->
-	<draw_ops name="icon_maximize">
+	<draw_ops name="icon_maximize_shadow">
 		<!--
 			I want my rectangle nicelly centered so I won't let metacity do the roundings
 			hence why I use (width-width%3)/3, it's like doing an integer division.
 		-->
-
-		<!-- shadow -->
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-		<!-- glyph -->
+	</draw_ops>
+	
+	<draw_ops name="icon_maximize_glyph">
 		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
 		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
 	</draw_ops>
 
+	<draw_ops name="icon_maximize">
+		<include name="icon_maximize_shadow" />
+		<include name="icon_maximize_glyph" />
+	</draw_ops>
+
+	<draw_ops name="icon_maximize_prelight">
+		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
+		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
+		<include name="icon_maximize_glyph" />
+	</draw_ops>
+
+
   <draw_ops name="button_maximize_unfocused">
 		<!-- glyph -->
 		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
@@ -494,25 +526,38 @@
 
   <draw_ops name="button_maximize_unfocused_prelight">
 		<!-- glyph -->
-		<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
+	<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
+	<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
   </draw_ops>
 
   <draw_ops name="button_maximize_unfocused_pressed">
 		<!-- glyph -->
-		<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
+	<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
+	<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
   </draw_ops>
 
 
   <!-- Minimize Buttons -->
+
+  <draw_ops name="icon_minimize_glyph">
+	<rectangle color="CIconFocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)-1" width="width-2*((width-width%3)/3)-5" height="1"/>
+  </draw_ops>
+
+  <draw_ops name="icon_minimize_shadow">
+	<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
+  </draw_ops>
+
   <draw_ops name="icon_minimize">
-		<!-- shadow -->
-		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-		<!-- glyph -->
-		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)-1" width="width-2*((width-width%3)/3)-5" height="1"/>
+	<include name="icon_minimize_shadow" />
+	<include name="icon_minimize_glyph" />	
   </draw_ops>
 
+  <draw_ops name="icon_minimize_prelight">
+	<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
+	<include name="icon_minimize_glyph" />	
+  </draw_ops>
+
+
   <draw_ops name="button_minimize_unfocused">
 		<!-- glyph -->
 		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
@@ -548,13 +593,13 @@
 	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right"/>
 
      <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close"/>
+     <button function="close" state="prelight" draw_ops="icon_close_prelight"/>
      <button function="close" state="pressed" draw_ops="icon_close"/>
      <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize"/>
+     <button function="maximize" state="prelight" draw_ops="icon_maximize_prelight"/>
      <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
      <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize"/>
+     <button function="minimize" state="prelight" draw_ops="icon_minimize_prelight"/>
      <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
      <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
      <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
@@ -602,13 +647,13 @@
 	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right_max"/>
 
      <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close"/>
+     <button function="close" state="prelight" draw_ops="icon_close_prelight"/>
      <button function="close" state="pressed" draw_ops="icon_close"/>
      <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize"/>
+     <button function="maximize" state="prelight" draw_ops="icon_maximize_prelight"/>
      <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
      <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize"/>
+     <button function="minimize" state="prelight" draw_ops="icon_minimize_prelight"/>
      <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
      <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
      <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
diff --git a/themes/Adwaita/metacity-1/metacity-theme-3.xml b/themes/Adwaita/metacity-1/metacity-theme-3.xml
index 7826fc8..cf82d47 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-3.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-3.xml
@@ -266,7 +266,7 @@
 		<gradient type="vertical" x="0" y="0" width="width" height="height - 3">
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.10"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.12"/>
+			<color value="blend/gtk:bg[SELECTED]/gtk:bg[NORMAL]/0.65"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
 		</gradient>
 		<include name="button_separator" />
@@ -435,16 +435,8 @@
   <!-- on unfocused window -->
 
   <!-- Close Buttons -->
-	<draw_ops name="icon_close">
-		<!-- shadow -->
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
 
-		<!-- glyph -->
+	<draw_ops name="icon_close_glyph">
 		<line color="CIconFocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
 		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-3" />
 		<line color="CIconFocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-2" />
@@ -453,6 +445,34 @@
 		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-2" />
 	</draw_ops>
 
+	<draw_ops name="icon_close_shadow">
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
+		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
+
+	</draw_ops>
+
+
+	<draw_ops name="icon_close">
+		<include name="icon_close_shadow" />
+		<include name="icon_close_glyph" />
+	</draw_ops>
+
+	<draw_ops name="icon_close_prelight">
+		<!-- shadow -->
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
+		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
+		<include name="icon_close_glyph" />
+	</draw_ops>
+
+
 	<draw_ops name="icon_close_single">
 		<!-- shadow -->
 		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-1" />
@@ -506,20 +526,32 @@
 
   <!-- Maximize Buttons -->
 	<!-- !!!metacity actually draws rectagles 1px bigger then what is set!!! (that's the cause of the "-1"s in dimensions) -->
-	<draw_ops name="icon_maximize">
+	<draw_ops name="icon_maximize_shadow">
 		<!--
 			I want my rectangle nicelly centered so I won't let metacity do the roundings
 			hence why I use (width-width%3)/3, it's like doing an integer division.
 		-->
-
-		<!-- shadow -->
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-		<!-- glyph -->
+	</draw_ops>
+	
+	<draw_ops name="icon_maximize_glyph">
 		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
 		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
 	</draw_ops>
 
+	<draw_ops name="icon_maximize">
+		<include name="icon_maximize_shadow" />
+		<include name="icon_maximize_glyph" />
+	</draw_ops>
+
+	<draw_ops name="icon_maximize_prelight">
+		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
+		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
+		<include name="icon_maximize_glyph" />
+	</draw_ops>
+
+
   <draw_ops name="button_maximize_unfocused">
 		<!-- glyph -->
 		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
@@ -528,25 +560,38 @@
 
   <draw_ops name="button_maximize_unfocused_prelight">
 		<!-- glyph -->
-		<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
+	<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
+	<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
   </draw_ops>
 
   <draw_ops name="button_maximize_unfocused_pressed">
 		<!-- glyph -->
-		<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
+	<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
+	<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
   </draw_ops>
 
 
   <!-- Minimize Buttons -->
+
+  <draw_ops name="icon_minimize_glyph">
+	<rectangle color="CIconFocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)-1" width="width-2*((width-width%3)/3)-5" height="1"/>
+  </draw_ops>
+
+  <draw_ops name="icon_minimize_shadow">
+	<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
+  </draw_ops>
+
   <draw_ops name="icon_minimize">
-		<!-- shadow -->
-		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-		<!-- glyph -->
-		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)-1" width="width-2*((width-width%3)/3)-5" height="1"/>
+	<include name="icon_minimize_shadow" />
+	<include name="icon_minimize_glyph" />	
   </draw_ops>
 
+  <draw_ops name="icon_minimize_prelight">
+	<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
+	<include name="icon_minimize_glyph" />	
+  </draw_ops>
+
+
   <draw_ops name="button_minimize_unfocused">
 		<!-- glyph -->
 		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
@@ -582,13 +627,13 @@
 	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right"/>
 
      <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close"/>
+     <button function="close" state="prelight" draw_ops="icon_close_prelight"/>
      <button function="close" state="pressed" draw_ops="icon_close"/>
      <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize"/>
+     <button function="maximize" state="prelight" draw_ops="icon_maximize_prelight"/>
      <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
      <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize"/>
+     <button function="minimize" state="prelight" draw_ops="icon_minimize_prelight"/>
      <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
      <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
      <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
@@ -636,13 +681,13 @@
 	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right_max"/>
 
      <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close"/>
+     <button function="close" state="prelight" draw_ops="icon_close_prelight"/>
      <button function="close" state="pressed" draw_ops="icon_close"/>
      <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize"/>
+     <button function="maximize" state="prelight" draw_ops="icon_maximize_prelight"/>
      <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
-     <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize"/>
+																																																																																																																																																			     <button function="minimize" state="normal" draw_ops="icon_minimize"/>
+     <button function="minimize" state="prelight" draw_ops="icon_minimize_prelight"/>
      <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
      <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
      <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]