gnome-themes r1398 - in trunk: . metacity-themes/Clearlooks metacity-themes/ClearlooksClassic metacity-themes/Glossy metacity-themes/Inverted
- From: acimitan svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-themes r1398 - in trunk: . metacity-themes/Clearlooks metacity-themes/ClearlooksClassic metacity-themes/Glossy metacity-themes/Inverted
- Date: Wed, 23 Jan 2008 00:52:04 +0000 (GMT)
Author: acimitan
Date: Wed Jan 23 00:52:03 2008
New Revision: 1398
URL: http://svn.gnome.org/viewvc/gnome-themes?rev=1398&view=rev
Log:
2008-01-23 Andrea Cimitan <andrea cimitan gmail com>
* metacity-themes/Clearlooks/metacity-theme-1.xml:
* metacity-themes/ClearlooksClassic/metacity-theme-1.xml:
* metacity-themes/Glossy/metacity-theme-1.xml:
* metacity-themes/Inverted/metacity-theme-1.xml:
Performance boost for ClearlooksClassic, Glossy, Inverted.
Fix in Clearlooks and smooth effect on top corners
Modified:
trunk/ChangeLog
trunk/metacity-themes/Clearlooks/metacity-theme-1.xml
trunk/metacity-themes/ClearlooksClassic/metacity-theme-1.xml
trunk/metacity-themes/Glossy/metacity-theme-1.xml
trunk/metacity-themes/Inverted/metacity-theme-1.xml
Modified: trunk/metacity-themes/Clearlooks/metacity-theme-1.xml
==============================================================================
--- trunk/metacity-themes/Clearlooks/metacity-theme-1.xml (original)
+++ trunk/metacity-themes/Clearlooks/metacity-theme-1.xml Wed Jan 23 00:52:03 2008
@@ -66,26 +66,34 @@
<!-- ::: CORNERS ::: -->
<draw_ops name="corners_outline_selected_top">
<!-- top left -->
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="3"/>
+ <line color="shade/gtk:bg[SELECTED]/0.73" x1="1" y1="4" x2="1" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="2" y2="2"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="4" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="3" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.73" x1="4" y1="1" x2="4" y2="1"/>
<!-- top right -->
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="3"/>
+ <line color="shade/gtk:bg[SELECTED]/0.73" x1="width-2" y1="4" x2="width-2" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-3" y1="2" x2="width-3" y2="2"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-4" y1="1" x2="width-5" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-4" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.73" x1="width-5" y1="1" x2="width-5" y2="1"/>
</draw_ops>
<draw_ops name="corners_outline_top">
<!-- top left -->
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="3"/>
+ <line color="shade/gtk:bg[NORMAL]/0.68" x1="1" y1="4" x2="1" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="2" y2="2"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="4" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="3" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.68" x1="4" y1="1" x2="4" y2="1"/>
<!-- top right -->
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="width-2" y1="3" x2="width-2" y2="4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="width-2" y1="3" x2="width-2" y2="3"/>
+ <line color="shade/gtk:bg[NORMAL]/0.68" x1="width-2" y1="4" x2="width-2" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-3" y1="2" x2="width-3" y2="2"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="width-4" y1="1" x2="width-5" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="width-4" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.68" x1="width-5" y1="1" x2="width-5" y2="1"/>
</draw_ops>
<draw_ops name="corners_outline_selected_bottom">
@@ -112,74 +120,74 @@
<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
</draw_ops>
-<draw_ops name="corners_hilight">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[SELECTED]/1.18" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.18" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.16" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
</draw_ops>
-<draw_ops name="corners_hilight_unfocused">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_unfocused">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[NORMAL]/1.05" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.04" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
</draw_ops>
-<draw_ops name="corners_hilight_shaded">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_shaded">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[SELECTED]/1.18" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.18" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.16" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<line color="shade/gtk:bg[SELECTED]/1.08" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[SELECTED]/0.98" x1="3" y1="height-3" x2="4" y2="height-3"/>
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
-<draw_ops name="corners_hilight_shaded_unfocused">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_shaded_unfocused">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[NORMAL]/1.05" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.04" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<line color="shade/gtk:bg[NORMAL]/1.02" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
@@ -194,7 +202,7 @@
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="3" x2="width - 2" y2="height - 2"/>
<line color="shade/gtk:bg[NORMAL]/1.2" x1="3" y1="1" x2="width - 4" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/1.2" x1="1" y1="3" x2="1" y2="height - 2"/>
-
+
<line color="shade/gtk:bg[SELECTED]/0.94" x1="2" y1="title_height + 5" x2="width - 3" y2="title_height + 5"/>
<line color="shade/gtk:bg[SELECTED]/0.95" x1="width - 2" y1="2" x2="width - 2" y2="title_height + 6"/>
<line color="shade/gtk:bg[SELECTED]/1.18" x1="1" y1="1" x2="width - 2" y2="1"/>
@@ -209,9 +217,9 @@
<color value="shade/gtk:bg[SELECTED]/1.08"/>
<color value="shade/gtk:bg[SELECTED]/1.02"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.7" x1="1" y1="title_height + 6" x2="width - 2" y2="title_height + 6"/>
-
+
<!-- ** border outline ** -->
<line color="shade/gtk:bg[NORMAL]/0.45" x1="0" y1="title_height + 6" x2="0" y2="height"/>
<line color="shade/gtk:bg[NORMAL]/0.45" x1="width - 1" y1="title_height + 6" x2="width - 1" y2="height"/>
@@ -233,7 +241,7 @@
<color value="shade/gtk:bg[SELECTED]/1.08"/>
<color value="shade/gtk:bg[SELECTED]/1.02"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.7" x1="0" y1="title_height + 6" x2="width" y2="title_height + 6"/>
<line color="shade/gtk:bg[SELECTED]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
@@ -242,7 +250,7 @@
<include name="bevel"/>
<include name="corners_outline_selected_top"/>
<!--<include name="corners_outline_bottom"/>-->
- <include name="corners_hilight"/>
+ <include name="corners_highlight"/>
</draw_ops>
<draw_ops name="bevel_shaded">
@@ -254,7 +262,7 @@
<include name="bevel"/>
<include name="corners_outline_selected_top"/>
<include name="corners_outline_selected_bottom"/>
- <include name="corners_hilight_shaded"/>
+ <include name="corners_highlight_shaded"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="5" y1="height-1" x2="width-6" y2="height-1"/>
</draw_ops>
@@ -295,7 +303,7 @@
<color value="shade/gtk:bg[NORMAL]/0.99"/>
<color value="shade/gtk:bg[NORMAL]/0.95"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.65" x1="0" y1="title_height + 6" x2="width" y2="title_height + 6"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
@@ -304,14 +312,14 @@
<include name="bevel_unfocused"/>
<include name="corners_outline_top"/>
<!--<include name="corners_outline_bottom"/>-->
- <include name="corners_hilight_unfocused"/>
+ <include name="corners_highlight_unfocused"/>
</draw_ops>
<draw_ops name="round_bevel_unfocused_shaded">
<include name="bevel_unfocused"/>
<include name="corners_outline_top"/>
<include name="corners_outline_bottom"/>
- <include name="corners_hilight_shaded_unfocused"/>
+ <include name="corners_highlight_shaded_unfocused"/>
</draw_ops>
<!-- ::: BORDER ::: -->
@@ -320,7 +328,7 @@
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="1" x2="width - 2" y2="height - 2"/>
<line color="shade/gtk:bg[NORMAL]/1.2" x1="1" y1="1" x2="width - 2" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/1.2" x1="1" y1="1" x2="1" y2="height - 2"/>
-
+
<rectangle color="shade/gtk:bg[NORMAL]/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
</draw_ops>
@@ -353,12 +361,12 @@
<color value="shade/gtk:bg[SELECTED]/0.96"/>
<color value="shade/gtk:bg[SELECTED]/1.05"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/1.00" x1="2" y1="0" x2="width-3" y2="0"/>
<line color="shade/gtk:bg[SELECTED]/0.99" x1="1" y1="1" x2="width-2" y2="1"/>
<line color="shade/gtk:bg[SELECTED]/0.99" x1="0" y1="2" x2="width-1" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.98" x1="3" y1="0" x2="width-4" y2="0"/>
-
+
<line color="shade/gtk:bg[SELECTED]/0.91" x1="2" y1="1" x2="width-3" y2="1"/>
<line color="shade/gtk:bg[SELECTED]/0.90" x1="1" y1="2" x2="width-2" y2="2"/>
@@ -366,7 +374,7 @@
<line color="shade/gtk:bg[SELECTED]/1.00" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
<line color="shade/gtk:bg[SELECTED]/1.01" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
<line color="shade/gtk:bg[SELECTED]/1.06" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
+
<line color="shade/gtk:bg[SELECTED]/1.02" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
<line color="shade/gtk:bg[SELECTED]/1.03" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
@@ -377,20 +385,18 @@
<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- border smooth effect -->
<line color="shade/gtk:bg[SELECTED]/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.84" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
<line color="shade/gtk:bg[SELECTED]/0.90" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
-
+
<!-- inside highlight -->
<line color="shade/gtk:bg[SELECTED]/1.18" x1="4" y1="2" x2="width-5" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
<!-- inside shadow -->
- <line color="shade/gtk:bg[SELECTED]/0.92" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
<line color="shade/gtk:bg[SELECTED]/1.0" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
<color value="shade/gtk:bg[SELECTED]/1.1"/>
@@ -400,6 +406,10 @@
<color value="shade/gtk:bg[SELECTED]/1.0"/>
<color value="shade/gtk:bg[SELECTED]/0.92"/>
</gradient>
+
+ <!-- bottom border smooth effect -->
+ <line color="shade/gtk:bg[SELECTED]/0.84" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+ <line color="shade/gtk:bg[SELECTED]/0.92" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
<draw_ops name="button_bg_unfocused">
@@ -408,12 +418,12 @@
<color value="shade/gtk:bg[NORMAL]/0.92"/>
<color value="shade/gtk:bg[NORMAL]/0.96"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.93" x1="2" y1="0" x2="width-3" y2="0"/>
<line color="shade/gtk:bg[NORMAL]/0.92" x1="1" y1="1" x2="width-2" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/0.92" x1="0" y1="2" x2="width-1" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.91" x1="3" y1="0" x2="width-4" y2="0"/>
-
+
<line color="shade/gtk:bg[NORMAL]/0.87" x1="2" y1="1" x2="width-3" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/0.86" x1="1" y1="2" x2="width-2" y2="2"/>
@@ -421,32 +431,30 @@
<line color="shade/gtk:bg[NORMAL]/0.93" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
<line color="shade/gtk:bg[NORMAL]/0.935" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
<line color="shade/gtk:bg[NORMAL]/0.96" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
+
<line color="shade/gtk:bg[NORMAL]/0.94" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
<line color="shade/gtk:bg[NORMAL]/0.95" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
<!-- border outline -->
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
<line color="shade/gtk:bg[NORMAL]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- border smooth effect -->
- <line color="shade/gtk:bg[NORMAL]/1.04" x1="3" y1="2" x2="width-4" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
- <line color="shade/gtk:bg[NORMAL]/0.85" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
<line color="shade/gtk:bg[NORMAL]/0.95" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
-
+
<!-- inside highlight -->
<line color="shade/gtk:bg[NORMAL]/1.2" x1="4" y1="2" x2="width-5" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
<!-- inside shadow -->
- <line color="shade/gtk:bg[NORMAL]/0.97" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
<line color="shade/gtk:bg[NORMAL]/1.05" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
<color value="shade/gtk:bg[NORMAL]/1.15"/>
@@ -456,6 +464,10 @@
<color value="shade/gtk:bg[NORMAL]/1.05"/>
<color value="shade/gtk:bg[NORMAL]/0.97"/>
</gradient>
+
+ <!-- bottom border smooth effect -->
+ <line color="shade/gtk:bg[NORMAL]/0.87" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+ <line color="shade/gtk:bg[NORMAL]/0.97" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
<draw_ops name="button_bg_prelight">
@@ -477,24 +489,24 @@
<line color="shade/gtk:bg[SELECTED]/1.0" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
<!-- border outline -->
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- inside shadow -->
<line color="shade/gtk:bg[SELECTED]/0.9" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.85" x1="2" y1="3" x2="2" y2="height-4"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
<color value="shade/gtk:bg[SELECTED]/0.95"/>
<color value="shade/gtk:bg[SELECTED]/0.9"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.9" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
</draw_ops>
@@ -517,44 +529,44 @@
<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
<!-- border outline -->
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- inside shadow -->
<line color="shade/gtk:bg[NORMAL]/0.8" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.75" x1="2" y1="3" x2="2" y2="height-4"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
<color value="shade/gtk:bg[NORMAL]/0.9"/>
<color value="shade/gtk:bg[NORMAL]/0.85"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.85" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
</draw_ops>
<!-- ::: ICONS ::: -->
-<!--
+<!--
using a minimum icon size until there is a proper way to specify relative sizes
unfortunately it's logically impossible to always center the icons on non-square
buttons (utility windows) without distortion.
-
+
icon_size = (Bmin`max`height-Bpad*2)
hpadding = (width - icon_size) / 2 = ((width-(Bmin`max`height-Bpad*2))/2)
vpadding = (height - icon_size) / 2 = ((height-(Bmin`max`height-Bpad*2))/2)
-->
<!-- menu icon -->
-<draw_ops name="menu_button_icon">
+<draw_ops name="menu_button_icon">
<!--<icon x="0" y="0" width="width" height="height"/>-->
<icon x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
</draw_ops>
-<draw_ops name="menu_button_icon_unfocused">
+<draw_ops name="menu_button_icon_unfocused">
<!--<icon x="0" y="0" width="width" height="height" alpha="0.5"/>-->
<icon x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
</draw_ops>
@@ -575,67 +587,67 @@
<!-- main cross -->
<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<!-- top-left -->
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
width="2" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
width="1" height="2"/>
<!-- top-right -->
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
- width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ width="2" height="1"/>
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="1" height="2"/>
<!-- bottom-left -->
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
- width="2" height="1"/>
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+ width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
width="1" height="2"/>
<!-- bottom-right -->
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
- width="2" height="1"/>
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+ width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
width="1" height="2"/>
- <!-- icon -->
+ <!-- icon -->
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width- ((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
</draw_ops>
<draw_ops name="close_button_icon_unfocused">
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
</draw_ops>
@@ -668,27 +680,27 @@
<draw_ops name="maximize_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2+1"/>
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-4"/>
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
</draw_ops>
<draw_ops name="maximize_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
</draw_ops>
@@ -721,27 +733,27 @@
<draw_ops name="restore_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
+ x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-5" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-6"/>
-
+
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
</draw_ops>
<draw_ops name="restore_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
</draw_ops>
@@ -774,17 +786,17 @@
<draw_ops name="minimize_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="3"/>
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="true"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
</draw_ops>
<draw_ops name="minimize_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="true"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
</draw_ops>
Modified: trunk/metacity-themes/ClearlooksClassic/metacity-theme-1.xml
==============================================================================
--- trunk/metacity-themes/ClearlooksClassic/metacity-theme-1.xml (original)
+++ trunk/metacity-themes/ClearlooksClassic/metacity-theme-1.xml Wed Jan 23 00:52:03 2008
@@ -112,56 +112,56 @@
<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
</draw_ops>
-<draw_ops name="corners_hilight_unfocused">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_unfocused">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[NORMAL]/1.15" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.15" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.14" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
</draw_ops>
-<draw_ops name="corners_hilight">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[SELECTED]/1.2" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.2" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.18" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
</draw_ops>
-<draw_ops name="corners_hilight_shaded">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_shaded">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[SELECTED]/1.2" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.2" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[SELECTED]/0.75" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.18" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<line color="shade/gtk:bg[SELECTED]/1.1" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[SELECTED]/0.75" x1="3" y1="height-3" x2="4" y2="height-3"/>
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<line color="shade/gtk:bg[SELECTED]/0.75" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[SELECTED]/0.75" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
@@ -186,7 +186,7 @@
<color value="shade/gtk:bg[NORMAL]/0.94"/>
<color value="shade/gtk:bg[NORMAL]/0.89"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.65" x1="0" y1="title_height + 6" x2="width" y2="title_height + 6"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
@@ -210,7 +210,7 @@
<color value="shade/gtk:bg[SELECTED]/0.98"/>
<color value="shade/gtk:bg[SELECTED]/0.9"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.65" x1="0" y1="title_height + 6" x2="width" y2="title_height + 6"/>
<line color="shade/gtk:bg[SELECTED]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
@@ -235,7 +235,7 @@
<color value="shade/gtk:bg[NORMAL]/0.94"/>
<color value="shade/gtk:bg[NORMAL]/0.89"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.65" x1="1" y1="title_height + 6" x2="width - 2" y2="title_height + 6"/>
<rectangle color="shade/gtk:bg[NORMAL]/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
</draw_ops>
@@ -244,14 +244,14 @@
<include name="bevel_unfocused"/>
<include name="corners_outline_top"/>
<!--<include name="corners_outline_bottom"/>-->
- <include name="corners_hilight_unfocused"/>
+ <include name="corners_highlight_unfocused"/>
</draw_ops>
<draw_ops name="round_bevel_unfocused_shaded">
<include name="bevel_unfocused"/>
<include name="corners_outline_top"/>
<include name="corners_outline_bottom"/>
- <include name="corners_hilight_unfocused"/>
+ <include name="corners_highlight_unfocused"/>
</draw_ops>
<draw_ops name="bevel">
@@ -263,7 +263,7 @@
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="3" x2="width - 2" y2="height - 2"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="3" y1="1" x2="width - 4" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="1" y1="3" x2="1" y2="height - 2"/>
-
+
<line color="shade/gtk:bg[SELECTED]/0.95" x1="2" y1="title_height + 5" x2="width - 3" y2="title_height + 5"/>
<line color="shade/gtk:bg[SELECTED]/0.95" x1="width - 2" y1="2" x2="width - 2" y2="title_height + 6"/>
<line color="shade/gtk:bg[SELECTED]/1.2" x1="1" y1="1" x2="width - 2" y2="1"/>
@@ -282,9 +282,9 @@
<color value="shade/gtk:bg[SELECTED]/0.98"/>
<color value="shade/gtk:bg[SELECTED]/0.9"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.65" x1="1" y1="title_height + 6" x2="width - 2" y2="title_height + 6"/>
-
+
<!-- ** border outline ** -->
<line color="shade/gtk:bg[NORMAL]/0.45" x1="0" y1="title_height + 6" x2="0" y2="height"/>
<line color="shade/gtk:bg[NORMAL]/0.45" x1="width - 1" y1="title_height + 6" x2="width - 1" y2="height"/>
@@ -295,7 +295,7 @@
<include name="bevel"/>
<include name="corners_outline_selected_top"/>
<!--<include name="corners_outline_bottom"/>-->
- <include name="corners_hilight"/>
+ <include name="corners_highlight"/>
</draw_ops>
<draw_ops name="bevel_shaded">
@@ -307,7 +307,7 @@
<include name="bevel"/>
<include name="corners_outline_selected_top"/>
<include name="corners_outline_selected_bottom"/>
- <include name="corners_hilight_shaded"/>
+ <include name="corners_highlight_shaded"/>
<line color="shade/gtk:bg[SELECTED]/0.55" x1="5" y1="height-1" x2="width-6" y2="height-1"/>
</draw_ops>
@@ -316,7 +316,7 @@
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="1" x2="width - 2" y2="height - 2"/>
<line color="shade/gtk:bg[NORMAL]/1.4" x1="1" y1="1" x2="width - 2" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/1.4" x1="1" y1="1" x2="1" y2="height - 2"/>
-
+
<rectangle color="shade/gtk:bg[NORMAL]/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
</draw_ops>
@@ -349,59 +349,49 @@
<color value="shade/gtk:bg[SELECTED]/0.98"/>
<color value="shade/gtk:bg[SELECTED]/1.05"/>
</gradient>
-
- <line color="shade/gtk:bg[SELECTED]/1.02" x1="2" y1="0" x2="width-3" y2="0"/>
- <line color="shade/gtk:bg[SELECTED]/1.01" x1="1" y1="1" x2="width-2" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/1.00" x1="0" y1="2" x2="width-1" y2="2"/>
- <line color="shade/gtk:bg[SELECTED]/1.00" x1="3" y1="0" x2="width-4" y2="0"/>
- <line color="shade/gtk:bg[SELECTED]/0.99" x1="2" y1="1" x2="width-3" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.98" x1="1" y1="2" x2="width-2" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/1.04" x1="2" y1="0" x2="width-3" y2="0"/>
+ <line color="shade/gtk:bg[SELECTED]/1.02" x1="1" y1="1" x2="width-2" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/1.02" x1="0" y1="2" x2="width-1" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/1.01" x1="3" y1="0" x2="width-4" y2="0"/>
+
+ <line color="shade/gtk:bg[SELECTED]/0.93" x1="2" y1="1" x2="width-3" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.92" x1="1" y1="2" x2="width-2" y2="2"/>
- <line color="shade/gtk:bg[SELECTED]/1.04" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
+ <line color="shade/gtk:bg[SELECTED]/1.03" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
<line color="shade/gtk:bg[SELECTED]/1.00" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/1.00" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
+ <line color="shade/gtk:bg[SELECTED]/1.01" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
<line color="shade/gtk:bg[SELECTED]/1.06" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
+
<line color="shade/gtk:bg[SELECTED]/1.02" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
<line color="shade/gtk:bg[SELECTED]/1.02" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
<!-- border outline -->
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
+ <!-- border smooth effect -->
+ <line color="shade/gtk:bg[SELECTED]/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.8" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+ <line color="shade/gtk:bg[SELECTED]/0.86" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
+
<!-- inside highlight -->
<line color="shade/gtk:bg[SELECTED]/1.2" x1="4" y1="2" x2="width-5" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
<!-- inside shadow -->
- <line color="shade/gtk:bg[SELECTED]/0.9" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
+ <line color="shade/gtk:bg[SELECTED]/0.85" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
<line color="shade/gtk:bg[SELECTED]/0.92" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-6" height="height-6">
<color value="shade/gtk:bg[SELECTED]/1.15"/>
<color value="shade/gtk:bg[SELECTED]/0.85"/>
</gradient>
-
- <!-- smooth effect -->
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="2" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="1" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-3" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-2" y="2" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="3" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="2" y="3" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-4" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-3" y="3" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="3" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="2" y="height-4" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-4" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-3" y="height-4" width="1" height="1"/>
</draw_ops>
<draw_ops name="button_bg_unfocused">
@@ -410,18 +400,20 @@
<color value="shade/gtk:bg[NORMAL]/0.93"/>
<color value="shade/gtk:bg[NORMAL]/0.97"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.94" x1="2" y1="0" x2="width-3" y2="0"/>
<line color="shade/gtk:bg[NORMAL]/0.95" x1="1" y1="1" x2="width-2" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/0.95" x1="0" y1="2" x2="width-1" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.93" x1="3" y1="0" x2="width-4" y2="0"/>
- <line color="shade/gtk:bg[NORMAL]/0.94" x1="2" y1="1" x2="width-3" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.94" x1="1" y1="2" x2="width-2" y2="2"/>
+
+ <line color="shade/gtk:bg[NORMAL]/0.84" x1="2" y1="1" x2="width-3" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.84" x1="1" y1="2" x2="width-2" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.96" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
<line color="shade/gtk:bg[NORMAL]/0.95" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
<line color="shade/gtk:bg[NORMAL]/0.94" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
<line color="shade/gtk:bg[NORMAL]/0.97" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
+
<line color="shade/gtk:bg[NORMAL]/0.96" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
<line color="shade/gtk:bg[NORMAL]/0.95" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
@@ -429,39 +421,29 @@
<line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
<line color="shade/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+
<line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
+ <!-- border smooth effect -->
+ <line color="shade/gtk:bg[NORMAL]/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.78" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+ <line color="shade/gtk:bg[NORMAL]/0.84" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
+
<!-- inside highlight -->
- <line color="shade/gtk:bg[NORMAL]/1.2" x1="3" y1="2" x2="width-4" y2="2"/>
- <line color="shade/gtk:bg[NORMAL]/1.1" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/1.2" x1="4" y1="2" x2="width-5" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
<!-- inside shadow -->
- <line color="shade/gtk:bg[NORMAL]/0.9" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
- <line color="shade/gtk:bg[NORMAL]/0.92" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
-
+ <line color="shade/gtk:bg[NORMAL]/0.85" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
+ <line color="shade/gtk:bg[NORMAL]/0.92" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-6" height="height-6">
<color value="shade/gtk:bg[NORMAL]/1.15"/>
<color value="shade/gtk:bg[NORMAL]/0.85"/>
</gradient>
-
- <!-- smooth effect -->
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="2" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="1" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-3" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-2" y="2" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="3" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="2" y="3" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-4" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-3" y="3" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="3" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="2" y="height-4" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-4" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-3" y="height-4" width="1" height="1"/>
</draw_ops>
<draw_ops name="button_bg_prelight">
@@ -483,18 +465,18 @@
<line color="shade/gtk:bg[SELECTED]/1.0" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
<!-- border outline -->
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- inside shadow -->
<line color="shade/gtk:bg[SELECTED]/0.8" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.75" x1="2" y1="3" x2="2" y2="height-4"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
<color value="shade/gtk:bg[SELECTED]/0.85"/>
@@ -522,17 +504,17 @@
<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
<!-- border outline -->
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- inside shadow -->
<line color="shade/gtk:bg[NORMAL]/0.8" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.75" x1="2" y1="3" x2="2" y2="height-4"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
<color value="shade/gtk:bg[NORMAL]/0.9"/>
@@ -542,23 +524,23 @@
</draw_ops>
<!-- ::: ICONS ::: -->
-<!--
+<!--
using a minimum icon size until there is a proper way to specify relative sizes
unfortunately it's logically impossible to always center the icons on non-square
buttons (utility windows) without distortion.
-
+
icon_size = (Bmin`max`height-Bpad*2)
hpadding = (width - icon_size) / 2 = ((width-(Bmin`max`height-Bpad*2))/2)
vpadding = (height - icon_size) / 2 = ((height-(Bmin`max`height-Bpad*2))/2)
-->
<!-- menu icon -->
-<draw_ops name="menu_button_icon">
+<draw_ops name="menu_button_icon">
<!--<icon x="0" y="0" width="width" height="height"/>-->
<icon x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
</draw_ops>
-<draw_ops name="menu_button_icon_unfocused">
+<draw_ops name="menu_button_icon_unfocused">
<!--<icon x="0" y="0" width="width" height="height" alpha="0.5"/>-->
<icon x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
</draw_ops>
@@ -579,67 +561,67 @@
<!-- main cross -->
<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<!-- top-left -->
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
width="2" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
width="1" height="2"/>
<!-- top-right -->
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
- width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ width="2" height="1"/>
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="1" height="2"/>
<!-- bottom-left -->
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
- width="2" height="1"/>
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+ width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
width="1" height="2"/>
<!-- bottom-right -->
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
- width="2" height="1"/>
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+ width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
width="1" height="2"/>
- <!-- icon -->
+ <!-- icon -->
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width- ((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
</draw_ops>
<draw_ops name="close_button_icon_unfocused">
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
</draw_ops>
@@ -672,27 +654,27 @@
<draw_ops name="maximize_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2+1"/>
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-4"/>
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
</draw_ops>
<draw_ops name="maximize_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
</draw_ops>
@@ -725,27 +707,27 @@
<draw_ops name="restore_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
+ x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-5" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-6"/>
-
+
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
</draw_ops>
<draw_ops name="restore_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
</draw_ops>
@@ -778,17 +760,17 @@
<draw_ops name="minimize_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="3"/>
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="true"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
</draw_ops>
<draw_ops name="minimize_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="true"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
</draw_ops>
Modified: trunk/metacity-themes/Glossy/metacity-theme-1.xml
==============================================================================
--- trunk/metacity-themes/Glossy/metacity-theme-1.xml (original)
+++ trunk/metacity-themes/Glossy/metacity-theme-1.xml Wed Jan 23 00:52:03 2008
@@ -112,74 +112,74 @@
<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
</draw_ops>
-<draw_ops name="corners_hilight">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[SELECTED]/1.25" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.25" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.23" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
</draw_ops>
-<draw_ops name="corners_hilight_unfocused">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_unfocused">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[NORMAL]/1.05" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.04" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
</draw_ops>
-<draw_ops name="corners_hilight_shaded">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_shaded">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[SELECTED]/1.25" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.25" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.23" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<line color="shade/gtk:bg[SELECTED]/1.21" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[SELECTED]/0.98" x1="3" y1="height-3" x2="4" y2="height-3"/>
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
-<draw_ops name="corners_hilight_shaded_unfocused">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_shaded_unfocused">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[NORMAL]/1.05" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/1.04" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<line color="shade/gtk:bg[NORMAL]/1.02" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
@@ -194,7 +194,7 @@
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="3" x2="width - 2" y2="height - 2"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="3" y1="1" x2="width - 4" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="1" y1="3" x2="1" y2="height - 2"/>
-
+
<line color="shade/gtk:bg[SELECTED]/1.08" x1="2" y1="title_height + 5" x2="width - 3" y2="title_height + 5"/>
<line color="shade/gtk:bg[SELECTED]/0.95" x1="width - 2" y1="2" x2="width - 2" y2="title_height + 6"/>
<line color="shade/gtk:bg[SELECTED]/1.25" x1="1" y1="1" x2="width - 2" y2="1"/>
@@ -209,9 +209,9 @@
<color value="shade/gtk:bg[SELECTED]/1.16"/>
<color value="shade/gtk:bg[SELECTED]/1.08"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.7" x1="1" y1="title_height + 6" x2="width - 2" y2="title_height + 6"/>
-
+
<!-- ** border outline ** -->
<line color="shade/gtk:bg[NORMAL]/0.45" x1="0" y1="title_height + 6" x2="0" y2="height"/>
<line color="shade/gtk:bg[NORMAL]/0.45" x1="width - 1" y1="title_height + 6" x2="width - 1" y2="height"/>
@@ -233,7 +233,7 @@
<color value="shade/gtk:bg[SELECTED]/1.16"/>
<color value="shade/gtk:bg[SELECTED]/1.08"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.7" x1="0" y1="title_height + 6" x2="width" y2="title_height + 6"/>
<line color="shade/gtk:bg[SELECTED]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
@@ -242,7 +242,7 @@
<include name="bevel"/>
<include name="corners_outline_selected_top"/>
<!--<include name="corners_outline_bottom"/>-->
- <include name="corners_hilight"/>
+ <include name="corners_highlight"/>
</draw_ops>
<draw_ops name="bevel_shaded">
@@ -254,7 +254,7 @@
<include name="bevel"/>
<include name="corners_outline_selected_top"/>
<include name="corners_outline_selected_bottom"/>
- <include name="corners_hilight_shaded"/>
+ <include name="corners_highlight_shaded"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="5" y1="height-1" x2="width-6" y2="height-1"/>
</draw_ops>
@@ -295,7 +295,7 @@
<color value="shade/gtk:bg[NORMAL]/0.98"/>
<color value="shade/gtk:bg[NORMAL]/0.94"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.65" x1="0" y1="title_height + 6" x2="width" y2="title_height + 6"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
@@ -304,14 +304,14 @@
<include name="bevel_unfocused"/>
<include name="corners_outline_top"/>
<!--<include name="corners_outline_bottom"/>-->
- <include name="corners_hilight_unfocused"/>
+ <include name="corners_highlight_unfocused"/>
</draw_ops>
<draw_ops name="round_bevel_unfocused_shaded">
<include name="bevel_unfocused"/>
<include name="corners_outline_top"/>
<include name="corners_outline_bottom"/>
- <include name="corners_hilight_shaded_unfocused"/>
+ <include name="corners_highlight_shaded_unfocused"/>
</draw_ops>
<!-- ::: BORDER ::: -->
@@ -320,7 +320,7 @@
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="1" x2="width - 2" y2="height - 2"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="1" y1="1" x2="width - 2" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="1" y1="1" x2="1" y2="height - 2"/>
-
+
<rectangle color="shade/gtk:bg[NORMAL]/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
</draw_ops>
@@ -353,38 +353,42 @@
<color value="shade/gtk:bg[SELECTED]/1.02"/>
<color value="shade/gtk:bg[SELECTED]/1.14"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/1.06" x1="2" y1="0" x2="width-3" y2="0"/>
<line color="shade/gtk:bg[SELECTED]/1.05" x1="1" y1="1" x2="width-2" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/1.04" x1="0" y1="2" x2="width-1" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/1.05" x1="0" y1="2" x2="width-1" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/1.04" x1="3" y1="0" x2="width-4" y2="0"/>
- <line color="shade/gtk:bg[SELECTED]/1.03" x1="2" y1="1" x2="width-3" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/1.02" x1="1" y1="2" x2="width-2" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.97" x1="2" y1="1" x2="width-3" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.96" x1="1" y1="2" x2="width-2" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/1.13" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
<line color="shade/gtk:bg[SELECTED]/1.09" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/1.09" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
+ <line color="shade/gtk:bg[SELECTED]/1.10" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
<line color="shade/gtk:bg[SELECTED]/1.15" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
- <line color="shade/gtk:bg[SELECTED]/1.11" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/1.11" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
+
+ <line color="shade/gtk:bg[SELECTED]/1.12" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
+ <line color="shade/gtk:bg[SELECTED]/1.13" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
<!-- border outline -->
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
+ <!-- border smooth effect -->
+ <line color="shade/gtk:bg[SELECTED]/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.94" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
+
<!-- inside highlight -->
<line color="shade/gtk:bg[SELECTED]/1.2" x1="4" y1="2" x2="width-5" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
<!-- inside shadow -->
- <line color="shade/gtk:bg[SELECTED]/1.1" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
<line color="shade/gtk:bg[SELECTED]/1.04" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
<color value="shade/gtk:bg[SELECTED]/1.2"/>
@@ -394,22 +398,10 @@
<color value="shade/gtk:bg[SELECTED]/1.0"/>
<color value="shade/gtk:bg[SELECTED]/1.1"/>
</gradient>
-
- <!-- smooth effect -->
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="2" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="1" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-3" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-2" y="2" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="3" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="2" y="3" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-4" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-3" y="3" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="3" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="2" y="height-4" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-4" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-3" y="height-4" width="1" height="1"/>
+
+ <!-- bottom border smooth effect -->
+ <line color="shade/gtk:bg[SELECTED]/1.00" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+ <line color="shade/gtk:bg[SELECTED]/1.1" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
<draw_ops name="button_bg_unfocused">
@@ -418,37 +410,43 @@
<color value="shade/gtk:bg[NORMAL]/0.92"/>
<color value="shade/gtk:bg[NORMAL]/0.96"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.93" x1="2" y1="0" x2="width-3" y2="0"/>
- <line color="shade/gtk:bg[NORMAL]/0.94" x1="1" y1="1" x2="width-2" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.94" x1="0" y1="2" x2="width-1" y2="2"/>
- <line color="shade/gtk:bg[NORMAL]/0.92" x1="3" y1="0" x2="width-4" y2="0"/>
- <line color="shade/gtk:bg[NORMAL]/0.93" x1="2" y1="1" x2="width-3" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.93" x1="1" y1="2" x2="width-2" y2="2"/>
-
- <line color="shade/gtk:bg[NORMAL]/0.95" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
- <line color="shade/gtk:bg[NORMAL]/0.94" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
- <line color="shade/gtk:bg[NORMAL]/0.93" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
- <line color="shade/gtk:bg[NORMAL]/0.96" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
- <line color="shade/gtk:bg[NORMAL]/0.95" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
- <line color="shade/gtk:bg[NORMAL]/0.94" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
+ <line color="shade/gtk:bg[NORMAL]/0.92" x1="1" y1="1" x2="width-2" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.92" x1="0" y1="2" x2="width-1" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.91" x1="3" y1="0" x2="width-4" y2="0"/>
+
+ <line color="shade/gtk:bg[NORMAL]/0.87" x1="2" y1="1" x2="width-3" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.86" x1="1" y1="2" x2="width-2" y2="2"/>
+
+ <line color="shade/gtk:bg[NORMAL]/0.945" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.93" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.935" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
+ <line color="shade/gtk:bg[NORMAL]/0.96" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
+
+ <line color="shade/gtk:bg[NORMAL]/0.94" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.95" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
<!-- border outline -->
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
+ <!-- border smooth effect -->
+ <line color="shade/gtk:bg[NORMAL]/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.95" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
+
<!-- inside highlight -->
- <line color="shade/gtk:bg[NORMAL]/1.2" x1="3" y1="2" x2="width-4" y2="2"/>
- <line color="shade/gtk:bg[NORMAL]/1.1" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/1.2" x1="4" y1="2" x2="width-5" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
<!-- inside shadow -->
- <line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
- <line color="shade/gtk:bg[NORMAL]/1.02" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
-
+ <line color="shade/gtk:bg[NORMAL]/1.02" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
<color value="shade/gtk:bg[NORMAL]/1.1"/>
@@ -458,22 +456,10 @@
<color value="shade/gtk:bg[NORMAL]/1.0"/>
<color value="shade/gtk:bg[NORMAL]/1.05"/>
</gradient>
-
- <!-- smooth effect -->
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="2" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="1" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-3" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-2" y="2" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="3" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="2" y="3" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-4" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-3" y="3" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="3" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="2" y="height-4" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-4" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-3" y="height-4" width="1" height="1"/>
+
+ <!-- bottom border smooth effect -->
+ <line color="shade/gtk:bg[NORMAL]/0.95" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+ <line color="shade/gtk:bg[NORMAL]/1.05" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
<draw_ops name="button_bg_prelight">
@@ -495,18 +481,18 @@
<line color="shade/gtk:bg[SELECTED]/1.0" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
<!-- border outline -->
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- inside shadow -->
<line color="shade/gtk:bg[SELECTED]/0.9" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.85" x1="2" y1="3" x2="2" y2="height-4"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
<color value="shade/gtk:bg[SELECTED]/0.95"/>
@@ -534,17 +520,17 @@
<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
<!-- border outline -->
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- inside shadow -->
<line color="shade/gtk:bg[NORMAL]/0.8" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.75" x1="2" y1="3" x2="2" y2="height-4"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
<color value="shade/gtk:bg[NORMAL]/0.9"/>
@@ -554,23 +540,23 @@
</draw_ops>
<!-- ::: ICONS ::: -->
-<!--
+<!--
using a minimum icon size until there is a proper way to specify relative sizes
unfortunately it's logically impossible to always center the icons on non-square
buttons (utility windows) without distortion.
-
+
icon_size = (Bmin`max`height-Bpad*2)
hpadding = (width - icon_size) / 2 = ((width-(Bmin`max`height-Bpad*2))/2)
vpadding = (height - icon_size) / 2 = ((height-(Bmin`max`height-Bpad*2))/2)
-->
<!-- menu icon -->
-<draw_ops name="menu_button_icon">
+<draw_ops name="menu_button_icon">
<!--<icon x="0" y="0" width="width" height="height"/>-->
<icon x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
</draw_ops>
-<draw_ops name="menu_button_icon_unfocused">
+<draw_ops name="menu_button_icon_unfocused">
<!--<icon x="0" y="0" width="width" height="height" alpha="0.5"/>-->
<icon x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
</draw_ops>
@@ -591,67 +577,67 @@
<!-- main cross -->
<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<!-- top-left -->
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
width="2" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
width="1" height="2"/>
<!-- top-right -->
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
- width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ width="2" height="1"/>
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="1" height="2"/>
<!-- bottom-left -->
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
- width="2" height="1"/>
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+ width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
width="1" height="2"/>
<!-- bottom-right -->
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
- width="2" height="1"/>
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+ width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
width="1" height="2"/>
- <!-- icon -->
+ <!-- icon -->
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width- ((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
</draw_ops>
<draw_ops name="close_button_icon_unfocused">
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
</draw_ops>
@@ -684,27 +670,27 @@
<draw_ops name="maximize_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2+1"/>
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-4"/>
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
</draw_ops>
<draw_ops name="maximize_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
</draw_ops>
@@ -737,27 +723,27 @@
<draw_ops name="restore_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
+ x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-5" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-6"/>
-
+
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
</draw_ops>
<draw_ops name="restore_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
</draw_ops>
@@ -790,17 +776,17 @@
<draw_ops name="minimize_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="3"/>
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="true"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
</draw_ops>
<draw_ops name="minimize_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="true"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
</draw_ops>
Modified: trunk/metacity-themes/Inverted/metacity-theme-1.xml
==============================================================================
--- trunk/metacity-themes/Inverted/metacity-theme-1.xml (original)
+++ trunk/metacity-themes/Inverted/metacity-theme-1.xml Wed Jan 23 00:52:03 2008
@@ -112,74 +112,74 @@
<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
</draw_ops>
-<draw_ops name="corners_hilight">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[SELECTED]/1.1" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.1" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.09" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
</draw_ops>
-<draw_ops name="corners_hilight_unfocused">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_unfocused">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[NORMAL]/0.98" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/0.98" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/0.98" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
</draw_ops>
-<draw_ops name="corners_hilight_shaded">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_shaded">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[SELECTED]/1.1" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.1" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[SELECTED]/1.09" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<line color="shade/gtk:bg[SELECTED]/1.11" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[SELECTED]/0.98" x1="3" y1="height-3" x2="4" y2="height-3"/>
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
-<draw_ops name="corners_hilight_shaded_unfocused">
- <!-- ** corner hilight for left top ** -->
+<draw_ops name="corners_highlight_shaded_unfocused">
+ <!-- ** corner highlight for left top ** -->
<line color="shade/gtk:bg[NORMAL]/0.98" x1="2" y1="3" x2="2" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/0.98" x1="3" y1="2" x2="4" y2="2"/>
- <!-- ** corner hilight for right top ** -->
+ <!-- ** corner highlight for right top ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
<line color="shade/gtk:bg[NORMAL]/0.98" x1="width-5" y1="2" x2="width-4" y2="2"/>
- <!-- ** corner hilight for left bottom ** -->
+ <!-- ** corner highlight for left bottom ** -->
<line color="shade/gtk:bg[NORMAL]/0.99" x1="2" y1="height-4" x2="2" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>
- <!-- ** corner hilight for right bottom ** -->
+ <!-- ** corner highlight for right bottom ** -->
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
</draw_ops>
@@ -194,7 +194,7 @@
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="3" x2="width - 2" y2="height - 2"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="3" y1="1" x2="width - 4" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="1" y1="3" x2="1" y2="height - 2"/>
-
+
<line color="shade/gtk:bg[SELECTED]/1.05" x1="2" y1="title_height + 5" x2="width - 3" y2="title_height + 5"/>
<line color="shade/gtk:bg[SELECTED]/0.95" x1="width - 2" y1="2" x2="width - 2" y2="title_height + 6"/>
<line color="shade/gtk:bg[SELECTED]/1.1" x1="1" y1="1" x2="width - 2" y2="1"/>
@@ -209,9 +209,9 @@
<color value="shade/gtk:bg[SELECTED]/0.95"/>
<color value="shade/gtk:bg[SELECTED]/1.0"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.7" x1="1" y1="title_height + 6" x2="width - 2" y2="title_height + 6"/>
-
+
<!-- ** border outline ** -->
<line color="shade/gtk:bg[NORMAL]/0.45" x1="0" y1="title_height + 6" x2="0" y2="height"/>
<line color="shade/gtk:bg[NORMAL]/0.45" x1="width - 1" y1="title_height + 6" x2="width - 1" y2="height"/>
@@ -233,7 +233,7 @@
<color value="shade/gtk:bg[SELECTED]/0.95"/>
<color value="shade/gtk:bg[SELECTED]/1.0"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.7" x1="0" y1="title_height + 6" x2="width" y2="title_height + 6"/>
<line color="shade/gtk:bg[SELECTED]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
@@ -242,7 +242,7 @@
<include name="bevel"/>
<include name="corners_outline_selected_top"/>
<!--<include name="corners_outline_bottom"/>-->
- <include name="corners_hilight"/>
+ <include name="corners_highlight"/>
</draw_ops>
<draw_ops name="bevel_shaded">
@@ -254,7 +254,7 @@
<include name="bevel"/>
<include name="corners_outline_selected_top"/>
<include name="corners_outline_selected_bottom"/>
- <include name="corners_hilight_shaded"/>
+ <include name="corners_highlight_shaded"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="5" y1="height-1" x2="width-6" y2="height-1"/>
</draw_ops>
@@ -295,7 +295,7 @@
<color value="shade/gtk:bg[NORMAL]/0.9"/>
<color value="shade/gtk:bg[NORMAL]/0.94"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.7" x1="0" y1="title_height + 6" x2="width" y2="title_height + 6"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
</draw_ops>
@@ -304,14 +304,14 @@
<include name="bevel_unfocused"/>
<include name="corners_outline_top"/>
<!--<include name="corners_outline_bottom"/>-->
- <include name="corners_hilight_unfocused"/>
+ <include name="corners_highlight_unfocused"/>
</draw_ops>
<draw_ops name="round_bevel_unfocused_shaded">
<include name="bevel_unfocused"/>
<include name="corners_outline_top"/>
<include name="corners_outline_bottom"/>
- <include name="corners_hilight_shaded_unfocused"/>
+ <include name="corners_highlight_shaded_unfocused"/>
</draw_ops>
<!-- ::: BORDER ::: -->
@@ -320,7 +320,7 @@
<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="1" x2="width - 2" y2="height - 2"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="1" y1="1" x2="width - 2" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/1.3" x1="1" y1="1" x2="1" y2="height - 2"/>
-
+
<rectangle color="shade/gtk:bg[NORMAL]/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
</draw_ops>
@@ -359,69 +359,55 @@
</gradient>
<line color="shade/gtk:bg[SELECTED]/0.95" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
<line color="shade/gtk:bg[SELECTED]/0.95" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
+
<!-- inset -->
<gradient type="vertical" x="0" y="3" width="width" height="height-6">
<color value="shade/gtk:bg[SELECTED]/0.9"/>
<color value="shade/gtk:bg[SELECTED]/1.1"/>
</gradient>
-
+
<line color="shade/gtk:bg[SELECTED]/0.94" x1="2" y1="0" x2="width-3" y2="0"/>
<line color="shade/gtk:bg[SELECTED]/0.93" x1="1" y1="1" x2="width-2" y2="1"/>
<line color="shade/gtk:bg[SELECTED]/0.92" x1="0" y1="2" x2="width-1" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.92" x1="3" y1="0" x2="width-4" y2="0"/>
- <line color="shade/gtk:bg[SELECTED]/0.91" x1="2" y1="1" x2="width-3" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.9" x1="1" y1="2" x2="width-2" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.85" x1="2" y1="1" x2="width-3" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.84" x1="1" y1="2" x2="width-2" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/1.09" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
<line color="shade/gtk:bg[SELECTED]/1.05" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
<line color="shade/gtk:bg[SELECTED]/1.05" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
<line color="shade/gtk:bg[SELECTED]/1.11" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
+
<line color="shade/gtk:bg[SELECTED]/1.07" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
<line color="shade/gtk:bg[SELECTED]/1.07" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
<!-- border outline -->
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
+ <!-- border smooth effect -->
+ <line color="shade/gtk:bg[SELECTED]/1.12" x1="3" y1="2" x2="width-4" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/1.05" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/1.05" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+ <line color="shade/gtk:bg[SELECTED]/1.05" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
+
<!-- inside highlight -->
- <line color="shade/gtk:bg[SELECTED]/1.2" x1="3" y1="2" x2="width-4" y2="2"/>
- <line color="shade/gtk:bg[SELECTED]/1.1" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/1.2" x1="4" y1="2" x2="width-5" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
<!-- inside shadow -->
- <line color="shade/gtk:bg[SELECTED]/1.2" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
- <line color="shade/gtk:bg[SELECTED]/1.14" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
-
+ <line color="shade/gtk:bg[SELECTED]/1.2" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
+ <line color="shade/gtk:bg[SELECTED]/1.14" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
+
<!-- fill gradient -->
- <gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
+ <gradient type="vertical" x="3" y="3" width="width-6" height="height-6">
<color value="shade/gtk:bg[SELECTED]/1.1"/>
- <color value="shade/gtk:bg[SELECTED]/1.15"/>
- </gradient>
- <gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2">
- <color value="shade/gtk:bg[SELECTED]/1.15"/>
<color value="shade/gtk:bg[SELECTED]/1.2"/>
</gradient>
-
- <!-- smooth effect -->
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="2" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="1" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-3" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-2" y="2" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="3" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="2" y="3" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-4" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-3" y="3" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="3" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="2" y="height-4" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-4" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.6" alpha="0.2" x="width-3" y="height-4" width="1" height="1"/>
</draw_ops>
<draw_ops name="button_bg_unfocused">
@@ -436,68 +422,56 @@
</gradient>
<line color="shade/gtk:bg[NORMAL]/0.95" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
<line color="shade/gtk:bg[NORMAL]/0.95" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
-
+
<!-- inset -->
<gradient type="vertical" x="0" y="3" width="width" height="height-6">
<color value="shade/gtk:bg[NORMAL]/0.86"/>
<color value="shade/gtk:bg[NORMAL]/1.0"/>
</gradient>
-
+
<line color="shade/gtk:bg[NORMAL]/0.87" x1="2" y1="0" x2="width-3" y2="0"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="1" y1="1" x2="width-2" y2="1"/>
<line color="shade/gtk:bg[NORMAL]/0.88" x1="0" y1="2" x2="width-1" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.86" x1="3" y1="0" x2="width-4" y2="0"/>
- <line color="shade/gtk:bg[NORMAL]/0.87" x1="2" y1="1" x2="width-3" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.87" x1="1" y1="2" x2="width-2" y2="2"/>
+
+ <line color="shade/gtk:bg[NORMAL]/0.78" x1="2" y1="1" x2="width-3" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.77" x1="1" y1="2" x2="width-2" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.99" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
<line color="shade/gtk:bg[NORMAL]/0.98" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
<line color="shade/gtk:bg[NORMAL]/0.97" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
- <line color="shade/gtk:bg[NORMAL]/1.0" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
+ <line color="shade/gtk:bg[NORMAL]/1.0" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
+
<line color="shade/gtk:bg[NORMAL]/0.99" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
<line color="shade/gtk:bg[NORMAL]/0.98" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
<!-- border outline -->
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+
+ <line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
+ <!-- border smooth effect -->
+ <line color="shade/gtk:bg[NORMAL]/0.94" x1="3" y1="2" x2="width-4" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.94" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.91" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+ <line color="shade/gtk:bg[NORMAL]/0.90" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
+
<!-- inside highlight -->
- <line color="shade/gtk:bg[NORMAL]/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
- <line color="shade/gtk:bg[NORMAL]/1.04" x1="2" y1="3" x2="2" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/1.02" x1="4" y1="2" x2="width-5" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/1.04" x1="2" y1="4" x2="2" y2="height-5"/>
<!-- inside shadow -->
- <line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
- <line color="shade/gtk:bg[NORMAL]/0.98" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
-
+ <line color="shade/gtk:bg[NORMAL]/1.05" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
+ <line color="shade/gtk:bg[NORMAL]/0.98" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
+
<!-- fill gradient -->
- <gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
+ <gradient type="vertical" x="3" y="3" width="width-6" height="height-6">
<color value="shade/gtk:bg[NORMAL]/0.95"/>
- <color value="shade/gtk:bg[NORMAL]/1.0"/>
- </gradient>
- <gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2">
- <color value="shade/gtk:bg[NORMAL]/1.0"/>
<color value="shade/gtk:bg[NORMAL]/1.05"/>
</gradient>
-
- <!-- smooth effect -->
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="2" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="1" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-3" y="1" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-2" y="2" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="3" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="2" y="3" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-4" y="2" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-3" y="3" width="1" height="1"/>
-
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="3" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="2" y="height-4" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-4" y="height-3" width="1" height="1"/>
- <tint color="shade/gtk:bg[NORMAL]/0.6" alpha="0.2" x="width-3" y="height-4" width="1" height="1"/>
</draw_ops>
<draw_ops name="button_bg_prelight">
@@ -519,18 +493,18 @@
<line color="shade/gtk:bg[SELECTED]/1.0" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
<!-- border outline -->
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
-
- <line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+
+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- inside shadow -->
<line color="shade/gtk:bg[SELECTED]/0.9" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[SELECTED]/0.85" x1="2" y1="3" x2="2" y2="height-4"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
<color value="shade/gtk:bg[SELECTED]/0.95"/>
@@ -558,17 +532,17 @@
<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
<!-- border outline -->
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
- <line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
-
+
<!-- inside shadow -->
<line color="shade/gtk:bg[NORMAL]/0.8" x1="3" y1="2" x2="width-4" y2="2"/>
<line color="shade/gtk:bg[NORMAL]/0.75" x1="2" y1="3" x2="2" y2="height-4"/>
-
+
<!-- fill gradient -->
<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
<color value="shade/gtk:bg[NORMAL]/0.9"/>
@@ -578,23 +552,23 @@
</draw_ops>
<!-- ::: ICONS ::: -->
-<!--
+<!--
using a minimum icon size until there is a proper way to specify relative sizes
unfortunately it's logically impossible to always center the icons on non-square
buttons (utility windows) without distortion.
-
+
icon_size = (Bmin`max`height-Bpad*2)
hpadding = (width - icon_size) / 2 = ((width-(Bmin`max`height-Bpad*2))/2)
vpadding = (height - icon_size) / 2 = ((height-(Bmin`max`height-Bpad*2))/2)
-->
<!-- menu icon -->
-<draw_ops name="menu_button_icon">
+<draw_ops name="menu_button_icon">
<!--<icon x="0" y="0" width="width" height="height"/>-->
<icon x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
</draw_ops>
-<draw_ops name="menu_button_icon_unfocused">
+<draw_ops name="menu_button_icon_unfocused">
<!--<icon x="0" y="0" width="width" height="height" alpha="0.5"/>-->
<icon x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
</draw_ops>
@@ -615,67 +589,67 @@
<!-- main cross -->
<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<!-- top-left -->
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
width="2" height="1"/>
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
width="1" height="2"/>
<!-- top-right -->
- <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
- width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ width="2" height="1"/>
+ <tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="1" height="2"/>
<!-- bottom-left -->
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
- width="2" height="1"/>
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+ width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
width="1" height="2"/>
<!-- bottom-right -->
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
- width="2" height="1"/>
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+ width="2" height="1"/>
<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
- x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+ x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
width="1" height="2"/>
- <!-- icon -->
+ <!-- icon -->
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width- ((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
x2="width - ((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
</draw_ops>
<draw_ops name="close_button_icon_unfocused">
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
</draw_ops>
@@ -708,27 +682,27 @@
<draw_ops name="maximize_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2+1"/>
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-4"/>
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
</draw_ops>
<draw_ops name="maximize_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
</draw_ops>
@@ -761,27 +735,27 @@
<draw_ops name="restore_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
+ x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-5" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-6"/>
-
+
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
</draw_ops>
<draw_ops name="restore_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+ x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
- x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+ x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
</draw_ops>
@@ -814,17 +788,17 @@
<draw_ops name="minimize_button_icon">
<!-- outside border -->
<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
- x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
+ x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="3"/>
<!-- icon -->
<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="true"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
</draw_ops>
<draw_ops name="minimize_button_icon_unfocused">
<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="true"
- x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+ x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
</draw_ops>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
