[gtk-engines/gnome3] avoid using white to make it somewhat usable with dark widget themes

From: Jakub Steiner <jimmac src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-engines/gnome3] avoid using white to make it somewhat usable with dark widget themes
Date: Mon, 23 Aug 2010 12:17:20 +0000 (UTC)
commit 6d9d00498fc7d0ded567ec7ca8765b805706e2dd
Author: Jakub Steiner <jimmac gmail com>
Date:   Mon Aug 23 14:17:05 2010 +0200

    avoid using white to make it somewhat usable with dark widget themes

 themes/GNOME3/metacity-1/metacity-theme-1.xml |   95 +++++++++++++-----------
 1 files changed, 51 insertions(+), 44 deletions(-)
---
diff --git a/themes/GNOME3/metacity-1/metacity-theme-1.xml b/themes/GNOME3/metacity-1/metacity-theme-1.xml
index 164e60a..1b70566 100644
--- a/themes/GNOME3/metacity-1/metacity-theme-1.xml
+++ b/themes/GNOME3/metacity-1/metacity-theme-1.xml
@@ -45,32 +45,32 @@
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
 		</gradient>
 		<!-- top -->
-		<tint color="#ffffff" x="1" y="1" width="width-1" height="1" alpha="0.8" />
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.8" x="1" y="1" width="width-1" height="1" alpha="0.8" />
 
 	</draw_ops>
 
 	<draw_ops name="bg_titlebar_unfocused">
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.06" x="1" y="1" width="width-1" height="height" filled="true"/>
 		<!-- aa -->
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="3" y1="1" x2="4" y2="1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="2" y1="2" x2="2" y2="2" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="1" y1="3" x2="1" y2="4" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="3" y1="1" x2="4" y2="1" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="2" y1="2" x2="2" y2="2" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="1" y1="3" x2="1" y2="4" />
 	</draw_ops>
 
   <draw_ops name="bg_titlebar">
 		<include name="bg_titlebar_maximized"/>
 		<!-- left upper rounded corner -->
 		<!-- aa -->
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="4" y2="1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="2" y2="2" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="4" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="4" y2="1" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="2" y2="2" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="4" />
 	</draw_ops>
 
 
   <!-- Window Borders -->
 
   <draw_ops name="lines_border_focused">
-	<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" x="0" y="0" width="width-1" height="height-1" filled="false"/>
+	<rectangle color="blend/#000000/gtk:bg[NORMAL]/0.6" x="0" y="0" width="width-1" height="height-1" filled="false"/>
   </draw_ops>
 
   <draw_ops name="lines_border_maximized_focused">
@@ -86,11 +86,11 @@
   <draw_ops name="title_all">
     <title x="11" y="(((height - title_height) / 2) `max` 0)+2" color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.3"/>
 		<tint color="#000000" alpha="0.2" x="width - 1" y="0" width="2" height="height-2" />
-		<tint color="#ffffff" alpha="0.4" x="width" y="0" width="2" height="height-2" />
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.9" alpha="0.4" x="width" y="0" width="2" height="height-2" />
   </draw_ops>
 
   <draw_ops name="title_all_unfocused">
-     <title x="11" y="(((height - title_height) / 2) `max` 0)+3" color="#ffffff"/>
+     <title x="11" y="(((height - title_height) / 2) `max` 0)+3" color="blend/#ffffff/gtk:bg[NORMAL]/0.9"/>
      <title x="11" y="(((height - title_height) / 2) `max` 0)+2" color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8"/>
   </draw_ops>
 
@@ -155,9 +155,11 @@
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.17"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
 		</gradient>
+		<!-- horziontal highlight on the bottom -->
 		<tint color="#000000" x="0" y="height - 2" width="width" height="1" alpha="0.1"/>
-		<tint color="#ffffff" x="0" y="height - 1" width="width" height="1" alpha="0.9"/>
-		<tint color="#ffffff" x="0" y="1" width="1" height="height - 2" alpha="0.2"/>
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="height - 1" width="width" height="1" alpha="0.9"/>
+		<!-- vertical separator stripes -->
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="1" width="1" height="height - 2" alpha="0.2"/>
 		<tint color="#000000" x="width - 1" y="1" width="1" height="height - 2" alpha="0.1"/>
 	</draw_ops>
 
@@ -168,9 +170,11 @@
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.12"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
 		</gradient>
+		<!-- horziontal highlight on the bottom -->
 		<tint color="#000000" x="0" y="height - 2" width="width" height="1" alpha="0.1"/>
-		<tint color="#ffffff" x="0" y="height - 1" width="width" height="1" alpha="0.9"/>
-		<tint color="#ffffff" x="0" y="1" width="1" height="height - 2" alpha="0.2"/>
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="height - 1" width="width" height="1" alpha="0.9"/>
+		<!-- vertical separator stripes -->
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="1" width="1" height="height - 2" alpha="0.2"/>
 		<tint color="#000000" x="width - 1" y="1" width="1" height="height - 2" alpha="0.1"/>
 	</draw_ops>
 
@@ -179,9 +183,12 @@
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.4"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
 		</gradient>
+		<!-- horziontal highlight on the bottom -->
 		<tint color="#000000" x="0" y="height - 2" width="width" height="1" alpha="0.1"/>
-		<tint color="#ffffff" x="0" y="height - 1" width="width" height="1" alpha="0.9"/>
-		<tint color="#ffffff" x="0" y="1" width="1" height="height - 2" alpha="0.05"/>
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="height - 1" width="width" height="1" alpha="0.9"/>
+
+		<!-- vertical separator stripes -->
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="1" width="1" height="height - 2" alpha="0.05"/>
 		<gradient type="vertical" x="width - 1" y="1" width="1" height="height - 2"> 
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.6"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.25"/>
@@ -201,19 +208,19 @@
 		<line color="blend/gtk:bg[NORMAL]/#000000/0.3" x1="(width/2.7) - 1" y1="height - (width/2.7) + 2" x2="width-(width/2.7)" y2="(width/2.7) + 1" />
 		<line color="blend/gtk:bg[NORMAL]/#000000/0.3" x1="(width/2.7)" y1="height - (width/2.7) + 2" x2="width-(width/2.7)" y2="(width/2.7) + 2" />
 		
-		<line color="#ffffff" x1="(width/2.7)" y1="(width/2.7)" x2="width-(width/2.7)" y2="height - (width/2.7)" />
-		<line color="#ffffff" x1="(width/2.7)-1" y1="(width/2.7)" x2="width-(width/2.7)" y2="height - (width/2.7) + 1" />
-		<line color="#ffffff" x1="(width/2.7)-1" y1="(width/2.7)+1" x2="width-(width/2.7) - 1" y2="height - (width/2.7) + 1" />
-		<line color="#ffffff" x1="(width/2.7)-1" y1="height - (width/2.7)" x2="width-(width/2.7) - 1" y2="(width/2.7)" />
-		<line color="#ffffff" x1="(width/2.7)-1" y1="height - (width/2.7) + 1" x2="width-(width/2.7)" y2="(width/2.7)" />
-		<line color="#ffffff" x1="(width/2.7)" y1="height - (width/2.7) + 1" x2="width-(width/2.7)" y2="(width/2.7)+1" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width/2.7)" y1="(width/2.7)" x2="width-(width/2.7)" y2="height - (width/2.7)" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width/2.7)-1" y1="(width/2.7)" x2="width-(width/2.7)" y2="height - (width/2.7) + 1" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width/2.7)-1" y1="(width/2.7)+1" x2="width-(width/2.7) - 1" y2="height - (width/2.7) + 1" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width/2.7)-1" y1="height - (width/2.7)" x2="width-(width/2.7) - 1" y2="(width/2.7)" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width/2.7)-1" y1="height - (width/2.7) + 1" x2="width-(width/2.7)" y2="(width/2.7)" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width/2.7)" y1="height - (width/2.7) + 1" x2="width-(width/2.7)" y2="(width/2.7)+1" />
 	</draw_ops>
 
 	<draw_ops name="rounded_outer_border">
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" x1="width - 5" y1="1" x2="width - 3" y2="1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" x1="width - 3" y1="2" x2="width - 2" y2="2" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" x1="width - 2" y1="3" x2="width - 2" y2="4" />		
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" x1="width - 1" y1="3" x2="width - 1" y2="height" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="width - 5" y1="1" x2="width - 3" y2="1" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="width - 3" y1="2" x2="width - 2" y2="2" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="width - 2" y1="3" x2="width - 2" y2="4" />		
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="width - 1" y1="3" x2="width - 1" y2="height" />
 	</draw_ops>
 
   <draw_ops name="button_close_normal"> 
@@ -250,12 +257,12 @@
   </draw_ops>
 
   <draw_ops name="button_close_unfocused">
-		<line color="#ffffff" x1="(width/2.7)" y1="(width/2.7) + 1" x2="width-(width/2.7)" y2="height - (width/2.7) + 1" />
-		<line color="#ffffff" x1="(width/2.7)-1" y1="(width/2.7) + 1" x2="width-(width/2.7)" y2="height - (width/2.7) + 2" />
-		<line color="#ffffff" x1="(width/2.7)-1" y1="(width/2.7) + 2" x2="width-(width/2.7)-1" y2="height - (width/2.7) + 2" />
-		<line color="#ffffff" x1="(width/2.7)-1" y1="height - (width/2.7) + 1" x2="width-(width/2.7)-1" y2="(width/2.7) + 1" />
-		<line color="#ffffff" x1="(width/2.7)-1" y1="height - (width/2.7) + 2" x2="width-(width/2.7)" y2="(width/2.7) + 1" />
-		<line color="#ffffff" x1="(width/2.7)" y1="height - (width/2.7) + 2" x2="width-(width/2.7)" y2="(width/2.7) + 2" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x1="(width/2.7)" y1="(width/2.7) + 1" x2="width-(width/2.7)" y2="height - (width/2.7) + 1" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x1="(width/2.7)-1" y1="(width/2.7) + 1" x2="width-(width/2.7)" y2="height - (width/2.7) + 2" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x1="(width/2.7)-1" y1="(width/2.7) + 2" x2="width-(width/2.7)-1" y2="height - (width/2.7) + 2" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x1="(width/2.7)-1" y1="height - (width/2.7) + 1" x2="width-(width/2.7)-1" y2="(width/2.7) + 1" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x1="(width/2.7)-1" y1="height - (width/2.7) + 2" x2="width-(width/2.7)" y2="(width/2.7) + 1" />
+		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x1="(width/2.7)" y1="height - (width/2.7) + 2" x2="width-(width/2.7)" y2="(width/2.7) + 2" />
 
 		<line color="blend/gtk:bg[NORMAL]/#000000/0.3" x1="(width/2.7)" y1="(width/2.7)" x2="width-(width/2.7)" y2="height - (width/2.7)" />
 		<line color="blend/gtk:bg[NORMAL]/#000000/0.3" x1="(width/2.7)-1" y1="(width/2.7)" x2="width-(width/2.7)" y2="height - (width/2.7) + 1" />
@@ -265,11 +272,11 @@
 		<line color="blend/gtk:bg[NORMAL]/#000000/0.3" x1="(width/2.7)" y1="height - (width/2.7) + 1" x2="width-(width/2.7)" y2="(width/2.7)+1" />
 
 		<!-- rounded corner on top -->
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width - 5" y1="1" x2="width - 3" y2="1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width - 3" y1="2" x2="width - 2" y2="2" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width - 2" y1="3" x2="width - 2" y2="4" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="width - 5" y1="1" x2="width - 3" y2="1" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="width - 3" y1="2" x2="width - 2" y2="2" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="width - 2" y1="3" x2="width - 2" y2="4" />
 		
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width - 1" y1="3" x2="width - 1" y2="height" />
+		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="width - 1" y1="3" x2="width - 1" y2="height" />
   </draw_ops>
 
   <!-- Maximize Buttons -->
@@ -278,9 +285,9 @@
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.3" x="(width/2.7)+1" y="(width/2.7)+2" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.3" x="(width/2.7)" y="(width/2.7)+1" width="width - (2 * width/2.7)+1" height="height - (2 * width/2.7)+1" filled="false"/>
 
-		<rectangle color="#ffffff" x="(width/2.7)" y="(width/2.7)" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
-		<rectangle color="#ffffff" x="(width/2.7)+1" y="(width/2.7)+1" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
-		<rectangle color="#ffffff" x="(width/2.7)" y="(width/2.7)" width="width - (2 * width/2.7)+1" height="height - (2 * width/2.7)+1" filled="false"/>
+		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x="(width/2.7)" y="(width/2.7)" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
+		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x="(width/2.7)+1" y="(width/2.7)+1" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
+		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x="(width/2.7)" y="(width/2.7)" width="width - (2 * width/2.7)+1" height="height - (2 * width/2.7)+1" filled="false"/>
 	</draw_ops>
 
   <draw_ops name="button_maximize_normal">
@@ -299,9 +306,9 @@
   </draw_ops>
 
   <draw_ops name="button_maximize_unfocused">
-		<rectangle color="#ffffff" x="(width/2.7)" y="(width/2.7)+1" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
-		<rectangle color="#ffffff" x="(width/2.7)+1" y="(width/2.7)+2" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
-		<rectangle color="#ffffff" x="(width/2.7)" y="(width/2.7)+1" width="width - (2 * width/2.7)+1" height="height - (2 * width/2.7)+1" filled="false"/>
+		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x="(width/2.7)" y="(width/2.7)+1" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
+		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x="(width/2.7)+1" y="(width/2.7)+2" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
+		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x="(width/2.7)" y="(width/2.7)+1" width="width - (2 * width/2.7)+1" height="height - (2 * width/2.7)+1" filled="false"/>
 
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.3" x="(width/2.7)" y="(width/2.7)" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.3" x="(width/2.7)+1" y="(width/2.7)+1" width="width - (2 * width/2.7)" height="height - (2 * width/2.7)" filled="false"/>
@@ -311,7 +318,7 @@
   <!-- Minimize Buttons -->
   <draw_ops name="icon_minimize">
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.3" x="(width/2.7)" y="height - (width/2.7) + 1" width="width - (width/2.7) * 2" height="2" filled="true"/>
-		<rectangle color="#ffffff" x="(width/2.7)" y="height - (width/2.7)" width="width - (width/2.7) * 2" height="2" filled="true"/>
+		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x="(width/2.7)" y="height - (width/2.7)" width="width - (width/2.7) * 2" height="2" filled="true"/>
   </draw_ops>
 
   <draw_ops name="button_minimize_normal">
@@ -333,7 +340,7 @@
   </draw_ops>
 
   <draw_ops name="button_minimize_unfocused">
-	<rectangle color="#ffffff" x="(width/2.7)" y="height - (width/2.7) + 1" width="width - (width/2.7) * 2" height="2" filled="true"/>
+	<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.6" x="(width/2.7)" y="height - (width/2.7) + 1" width="width - (width/2.7) * 2" height="2" filled="true"/>
 		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.3" x="(width/2.7)" y="height - (width/2.7)" width="width - (width/2.7) * 2" height="2" filled="true"/>
   </draw_ops>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]