================================
gnome-themes:source=2.13.90-0.2 (previous: 2.13.90-0.1)
cvc rdiff gnome-themes -1 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/2.13.90-0.2
================================
2.13.90-0.2 Ken VanDine ([EMAIL PROTECTED]) Wed Feb 1 09:31:26 2006
Make Clearlooks metacity look better
clearlooks2.patch: new
diff -Naur
gnome-themes-2.13.90.orig/metacity-themes/Clearlooks/metacity-theme-1.xml
gnome-themes-2.13.90/metacity-themes/Clearlooks/metacity-theme-1.xml
--- gnome-themes-2.13.90.orig/metacity-themes/Clearlooks/metacity-theme-1.xml
2006-01-30 12:45:54.000000000 -0500
+++ gnome-themes-2.13.90/metacity-themes/Clearlooks/metacity-theme-1.xml
2006-02-01 09:33:58.000000000 -0500
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-<!-- $Id: metacity-theme-1.xml,v 1.2 2006/01/29 14:12:28 thos Exp $ -->
+<!-- $Id: metacity-theme-1.xml,v 1.1 2005/08/01 18:39:07 thos Exp $ -->
<metacity_theme>
<info>
<name>Clearlooks</name>
<author>Daniel Borgmann <[EMAIL PROTECTED]></author>
<copyright>Â 2005 Daniel Borgmann</copyright>
- <date>Mar, 2005</date>
- <description>The Clearlooks Metacity Theme</description>
+ <date>Dec, 2005</date>
+ <description>The Clearlooks Metacity Theme (Version 2)</description>
</info>
<frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true"
rounded_bottom_left="false" rounded_bottom_right="false">
@@ -15,10 +15,10 @@
<distance name="bottom_height" value="5"/>
<distance name="left_titlebar_edge" value="4"/>
<distance name="right_titlebar_edge" value="4"/>
- <aspect_ratio name="button" value="1"/>
- <distance name="title_vertical_pad" value="0"/>
- <border name="title_border" left="2" right="2" top="4" bottom="3"/>
- <border name="button_border" left="0" right="0" top="2" bottom="2"/>
+ <aspect_ratio name="button" value="0.9"/>
+ <distance name="title_vertical_pad" value="4"/>
+ <border name="title_border" left="2" right="2" top="1" bottom="2"/>
+ <border name="button_border" left="0" right="0" top="0" bottom="0"/>
</frame_geometry>
<frame_geometry name="shaded" parent="normal" rounded_top_left="true"
rounded_top_right="true" rounded_bottom_left="true"
rounded_bottom_right="true"/>
@@ -28,20 +28,20 @@
<distance name="left_width" value="0"/>
<distance name="right_width" value="0"/>
<distance name="bottom_height" value="1"/>
- <distance name="left_titlebar_edge" value="1"/>
- <distance name="right_titlebar_edge" value="1"/>
+ <distance name="left_titlebar_edge" value="0"/>
+ <distance name="right_titlebar_edge" value="0"/>
</frame_geometry>
<frame_geometry name="utility" title_scale="small" rounded_top_left="false"
rounded_top_right="false" rounded_bottom_left="false"
rounded_bottom_right="false">
<distance name="left_width" value="5"/>
<distance name="right_width" value="5"/>
<distance name="bottom_height" value="5"/>
- <distance name="left_titlebar_edge" value="4"/>
- <distance name="right_titlebar_edge" value="4"/>
- <distance name="title_vertical_pad" value="0"/>
- <border name="title_border" left="2" right="2" top="4" bottom="3"/>
- <border name="button_border" left="0" right="0" top="2" bottom="2"/>
- <aspect_ratio name="button" value="1"/>
+ <distance name="left_titlebar_edge" value="0"/>
+ <distance name="right_titlebar_edge" value="2"/>
+ <distance name="title_vertical_pad" value="4"/>
+ <border name="title_border" left="0" right="2" top="1" bottom="2"/>
+ <border name="button_border" left="0" right="0" top="0" bottom="0"/>
+ <aspect_ratio name="button" value="0.8"/>
</frame_geometry>
<frame_geometry name="border" has_title="false">
@@ -60,7 +60,7 @@
<!-- button minimum size -->
<constant name="Bmin" value="7"/>
<!-- button inside padding -->
-<constant name="Bpad" value="6"/>
+<constant name="Bpad" value="8"/>
<draw_ops name="corners_outline_selected_top">
<!-- top left -->
@@ -109,35 +109,20 @@
<line color="shade/gtk:bg[NORMAL]/0.25" x1="width-4" y1="height-2"
x2="width-5" y2="height-2"/>
</draw_ops>
-<draw_ops name="corners_hilight_unfocused">
+<draw_ops name="corners_hilight">
- <!-- ** corner hilight for left top ** -->
- <line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="3" x2="2" y2="4"/>
- <line color="shade/gtk:bg[NORMAL]/1.3" x1="3" y1="2" x2="4" y2="2"/>
-
- <!-- ** corner hilight 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.3" x1="width-5" y1="2" x2="width-4"
y2="2"/>
+ <!-- ** corner hilight for left top ** -->
+ <tint color="shade/gtk:bg[SELECTED]/2" alpha="0.4"
+ x="2" y="3" width="1" height="2"/>
+ <tint color="shade/gtk:bg[SELECTED]/2" alpha="0.4"
+ x="3" y="2" width="2" height="1"/>
- <!-- ** corner hilight 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 ** -->
- <!--<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 ** -->
- <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 ** -->
- <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.2" x1="width-5" y1="2" x2="width-4"
y2="2"/>
+ <!-- ** corner hilight for right top ** -->
+ <tint color="shade/gtk:bg[SELECTED]/2" alpha="0.4"
+ x="width-5" y="2" width="2" height="1"/>
+ <tint color="#000000" alpha="0.1"
+ x="width-3" y="3" width="1" height="2"/>
<!-- ** corner hilight for left bottom ** -->
<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2"
y2="height-5"/>
@@ -151,156 +136,148 @@
<draw_ops name="corners_hilight_shaded">
- <!-- ** corner hilight 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 left bottom ** -->
- <line color="shade/gtk:bg[SELECTED]/1.2" 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 left top ** -->
+ <tint color="shade/gtk:bg[SELECTED]/2" alpha="0.4"
+ x="2" y="3" width="1" height="2"/>
+ <tint color="shade/gtk:bg[SELECTED]/2" alpha="0.4"
+ x="3" y="2" width="2" height="1"/>
+
+ <!-- ** corner hilight for right top ** -->
+ <tint color="shade/gtk:bg[SELECTED]/2" alpha="0.4"
+ x="width-5" y="2" width="2" height="1"/>
+ <tint color="#000000" alpha="0.1"
+ x="width-3" y="3" width="1" height="2"/>
+
+ <!-- ** corner hilight for left bottom ** -->
+ <tint color="shade/gtk:bg[SELECTED]/2" alpha="0.4"
+ x="2" y="height-5" width="1" height="2"/>
+ <tint color="#000000" alpha="0.1"
+ x="3" y="height-3" width="2" height="1"/>
- <!-- ** corner hilight 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.2" x1="width-5" y1="2" x2="width-4"
y2="2"/>
-
- <!-- ** corner hilight 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"/>
+ <!-- ** corner hilight for right bottom ** -->
+ <tint color="#000000" alpha="0.1"
+ x="width-5" y="height-3" width="2" height="1"/>
+ <tint color="#000000" alpha="0.1"
+ x="width-3" y="height-5" width="1" height="2"/>
</draw_ops>
+<draw_ops name="outer_frame">
+ <line color="shade/gtk:bg[NORMAL]/0.88" x1="1" y1="height - 2"
x2="width - 2" y2="height - 2"/>
+ <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"/>
+
+ <rectangle color="shade/gtk:bg[NORMAL]/0.25" filled="false"
+ x="0" y="0"
+ width="width - 1"
+ height="height - 1"/>
+</draw_ops>
-<draw_ops name="bevel_maximized_unfocused">
- <!-- ** 3d beveled frame ** -->
- <line color="shade/gtk:bg[NORMAL]/0.25" x1="0" y1="0" x2="width"
y2="0"/>
- <line color="shade/gtk:bg[NORMAL]/1.3" x1="0" y1="1" x2="width" y2="1"/>
- <line color="shade/gtk:bg[NORMAL]/0.88" x1="0" y1="top_height - 2"
x2="width" y2="top_height - 2"/>
+<draw_ops name="title_background">
+ <gradient type="vertical" x="0" y="1" width="width" height="top_height
/ 2">
+ <color value="shade/gtk:bg[SELECTED]/1.25"/>
+ <color value="shade/gtk:bg[SELECTED]/0.97"/>
+ </gradient>
+ <gradient type="vertical" x="0" y="top_height / 2" width="width"
height="top_height / 2">
+ <color value="shade/gtk:bg[SELECTED]/0.95"/>
+ <color value="shade/gtk:bg[SELECTED]/1.00"/>
+ </gradient>
+
+ <line color="shade/gtk:bg[SELECTED]/0.25" x1="0" y1="0" x2="width"
y2="0"/>
+
+ <!--<line color="shade/gtk:bg[SELECTED]/1.45" x1="0" y1="1" x2="width"
y2="1"/>-->
+ <tint color="shade/gtk:bg[SELECTED]/2" alpha="0.4"
+ x="0" y="1" width="width" height="1"/>
+
+ <line color="shade/gtk:bg[SELECTED]/0.9" x1="0" y1="top_height-2"
x2="width" y2="top_height-2"/>
+ <line color="shade/gtk:bg[SELECTED]/0.5" x1="0" y1="top_height-1"
x2="width-1" y2="top_height-1"/>
+</draw_ops>
+<!-- ** title background with side borders ** -->
+<draw_ops name="title_background_full">
+ <include name="title_background"/>
+
+ <line color="shade/gtk:bg[SELECTED]/0.25" x1="0" y1="0" x2="0"
y2="top_height-1"/>
+ <line color="shade/gtk:bg[SELECTED]/0.25" x1="width-1" y1="0"
x2="width-1" y2="top_height-1"/>
+
+ <tint color="shade/gtk:bg[SELECTED]/2" alpha="0.4"
+ x="1" y="2" width="1" height="top_height-3"/>
+ <tint color="#000000" alpha="0.1"
+ x="width-2" y="2" width="1" height="top_height-4"/>
+</draw_ops>
- <!-- ** fancy gradient ** -->
- <gradient type="vertical" x="0" y="2" width="width" height="6">
- <color value="shade/gtk:bg[NORMAL]/1.01"/>
- <color value="shade/gtk:bg[NORMAL]/0.96"/>
+<draw_ops name="title_background_unfocused">
+ <gradient type="vertical" x="0" y="1" width="width" height="top_height
/ 2">
+ <color value="shade/gtk:bg[NORMAL]/1.25"/>
+ <color value="shade/gtk:bg[NORMAL]/1.0"/>
</gradient>
- <gradient type="vertical" x="0" y="8" width="width" height="top_height
- 16">
- <color value="shade/gtk:bg[NORMAL]/0.96"/>
- <color value="shade/gtk:bg[NORMAL]/0.94"/>
- </gradient>
- <gradient type="vertical" x="0" y="8 + top_height - 16" width="width"
height="6">
- <color value="shade/gtk:bg[NORMAL]/0.94"/>
- <color value="shade/gtk:bg[NORMAL]/0.89"/>
+ <gradient type="vertical" x="0" y="top_height / 2" width="width"
height="top_height / 2">
+ <color value="shade/gtk:bg[NORMAL]/0.97"/>
+ <color value="shade/gtk:bg[NORMAL]/1.0"/>
</gradient>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="0" y1="top_height - 1" x2="width"
y2="top_height - 1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.25" x1="0" y1="0" x2="width"
y2="0"/>
+ <line color="shade/gtk:bg[NORMAL]/1.3" x1="0" y1="1" x2="width" y2="1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.93" x1="0" y1="top_height-2"
x2="width" y2="top_height-2"/>
+ <line color="shade/gtk:bg[NORMAL]/0.5" x1="0" y1="top_height-1"
x2="width-1" y2="top_height-1"/>
+</draw_ops>
- <line color="shade/gtk:bg[NORMAL]/0.25" x1="0" y1="height-1" x2="width"
y2="height-1"/>
+<draw_ops name="title_background_unfocused_full">
+ <include name="title_background_unfocused"/>
+
+ <line color="shade/gtk:bg[NORMAL]/0.25" x1="0" y1="0" x2="0"
y2="top_height-1"/>
+ <line color="shade/gtk:bg[NORMAL]/0.25" x1="width-1" y1="0"
x2="width-1" y2="top_height-1"/>
+
+ <tint color="shade/gtk:bg[NORMAL]/2" alpha="0.4"
+ x="1" y="2" width="1" height="top_height-3"/>
+ <tint color="#000000" alpha="0.1"
+ x="width-2" y="2" width="1" height="top_height-4"/>
</draw_ops>
<draw_ops name="bevel_maximized">
- <!-- ** 3d beveled frame ** -->
- <line color="shade/gtk:bg[SELECTED]/0.25" x1="0" y1="0" x2="width"
y2="0"/>
- <line color="shade/gtk:bg[SELECTED]/1.2" x1="0" y1="1" x2="width"
y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/0.75" x1="0" y1="top_height - 2"
x2="width" y2="top_height - 2"/>
+ <include name="title_background"/>
+ <line color="gtk:dark[NORMAL]" x1="0" y1="height-1" x2="width"
y2="height-1"/>
+</draw_ops>
- <!-- ** fancy gradient ** -->
- <gradient type="vertical" x="0" y="2" width="width" height="6">
- <color value="shade/gtk:bg[SELECTED]/1.02"/>
- <color value="shade/gtk:bg[SELECTED]/0.92"/>
- </gradient>
- <gradient type="vertical" x="0" y="8" width="width" height="top_height
- 16">
- <color value="shade/gtk:bg[SELECTED]/0.92"/>
- <color value="shade/gtk:bg[SELECTED]/0.88"/>
- </gradient>
- <gradient type="vertical" x="0" y="8 + top_height - 16" width="width"
height="6">
- <color value="shade/gtk:bg[SELECTED]/0.88"/>
- <color value="shade/gtk:bg[SELECTED]/0.8"/>
- </gradient>
-
- <line color="shade/gtk:bg[SELECTED]/0.5" x1="0" y1="top_height - 1"
x2="width" y2="top_height - 1"/>
-
+<draw_ops name="bevel_maximized_shaded">
+ <include name="title_background"/>
<line color="shade/gtk:bg[SELECTED]/0.25" x1="0" y1="height-1"
x2="width" y2="height-1"/>
</draw_ops>
-<draw_ops name="bevel_unfocused">
- <line color="shade/gtk:bg[NORMAL]/0.88" x1="1" y1="height - 2"
x2="width - 2" y2="height - 2"/>
- <line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="2" 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="2" x2="1" y2="height
- 2"/>
- <line color="shade/gtk:bg[NORMAL]/0.88" x1="2" y1="top_height - 2"
x2="width - 3" y2="top_height - 2"/>
-
- <!-- ** fancy gradient ** -->
- <gradient type="vertical" x="2" y="2" width="width - 4" height="6">
- <color value="shade/gtk:bg[NORMAL]/1.01"/>
- <color value="shade/gtk:bg[NORMAL]/0.96"/>
- </gradient>
- <gradient type="vertical" x="2" y="8" width="width - 4"
height="top_height - 16">
- <color value="shade/gtk:bg[NORMAL]/0.96"/>
- <color value="shade/gtk:bg[NORMAL]/0.94"/>
- </gradient>
- <gradient type="vertical" x="2" y="8 + top_height - 16" width="width -
4" height="6">
- <color value="shade/gtk:bg[NORMAL]/0.94"/>
- <color value="shade/gtk:bg[NORMAL]/0.89"/>
- </gradient>
- <line color="shade/gtk:bg[NORMAL]/0.6" x1="1" y1="top_height - 1" x2="width
- 2" y2="top_height - 1"/>
-
- <rectangle color="shade/gtk:bg[NORMAL]/0.25" filled="false"
- x="0" y="0"
- width="width - 1"
- height="height - 1"/>
+<draw_ops name="bevel_maximized_unfocused">
+ <include name="title_background_unfocused"/>
+ <line color="gtk:dark[NORMAL]" x1="0" y1="height-1" x2="width"
y2="height-1"/>
+</draw_ops>
+<draw_ops name="bevel_maximized_unfocused_shaded">
+ <include name="title_background_unfocused"/>
+ <line color="shade/gtk:bg[NORMAL]/0.25" x1="0" y1="height-1" x2="width"
y2="height-1"/>
+</draw_ops>
+
+<draw_ops name="bevel_unfocused">
+ <include name="outer_frame"/>
+ <include name="title_background_unfocused_full"/>
</draw_ops>
<draw_ops name="round_bevel_unfocused">
<include name="bevel_unfocused"/>
<include name="corners_outline_top"/>
<!--<include name="corners_outline_bottom"/>-->
- <include name="corners_hilight_unfocused"/>
+ <include name="corners_hilight"/>
</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_hilight_shaded"/>
+ <line color="shade/gtk:bg[NORMAL]/0.25" x1="5" y1="height-1" x2="width-6"
y2="height-1"/>
</draw_ops>
<draw_ops name="bevel">
- <!-- ** titlebar outline ** -->
- <rectangle color="shade/gtk:bg[SELECTED]/0.25" filled="false"
- x="0" y="0"
- width="width - 1"
- height="top_height - 1"/>
-
- <!-- ** 3d beveled frame ** -->
- <line color="shade/gtk:bg[NORMAL]/0.88" x1="1" y1="height - 2"
x2="width - 2" y2="height - 2"/>
- <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.75" x1="2" y1="top_height - 2"
x2="width - 3" y2="top_height - 2"/>
- <line color="shade/gtk:bg[SELECTED]/0.75" x1="width - 2" y1="2"
x2="width - 2" y2="top_height - 1"/>
- <line color="shade/gtk:bg[SELECTED]/1.2" x1="1" y1="1" x2="width - 2"
y2="1"/>
- <line color="shade/gtk:bg[SELECTED]/1.2" x1="1" y1="2" x2="1"
y2="top_height - 2"/>
-
- <!-- ** fancy gradient ** -->
- <gradient type="vertical" x="2" y="2" width="width - 4" height="6">
- <color value="shade/gtk:bg[SELECTED]/1.02"/>
- <color value="shade/gtk:bg[SELECTED]/0.92"/>
- </gradient>
- <gradient type="vertical" x="2" y="8" width="width - 4"
height="top_height - 16">
- <color value="shade/gtk:bg[SELECTED]/0.92"/>
- <color value="shade/gtk:bg[SELECTED]/0.88"/>
- </gradient>
- <gradient type="vertical" x="2" y="8 + top_height - 16" width="width -
4" height="6">
- <color value="shade/gtk:bg[SELECTED]/0.88"/>
- <color value="shade/gtk:bg[SELECTED]/0.8"/>
- </gradient>
- <line color="shade/gtk:bg[SELECTED]/0.5" x1="1" y1="top_height - 1"
x2="width - 2" y2="top_height - 1"/>
-
- <!-- ** border outline ** -->
- <line color="shade/gtk:bg[NORMAL]/0.25" x1="0" y1="top_height - 1"
x2="0" y2="height"/>
- <line color="shade/gtk:bg[NORMAL]/0.25" x1="width - 1" y1="top_height -
1" x2="width - 1" y2="height"/>
- <line color="shade/gtk:bg[NORMAL]/0.25" x1="1" y1="height - 1"
x2="width - 2" y2="height - 1"/>
+ <include name="outer_frame"/>
+ <include name="title_background_full"/>
</draw_ops>
<draw_ops name="round_bevel">
@@ -352,7 +329,7 @@
</draw_ops>
<draw_ops name="title_text_unfocused">
- <title color="gtk:fg[NORMAL]"
+ <title color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/1.2"
x="(3 `max` (width-title_width)) / 2"
y="((height - title_height) / 2) `max` 0"/>
</draw_ops>
@@ -366,171 +343,116 @@
</draw_ops>
<!-- ::: BUTTONS ::: -->
-<draw_ops name="button_bg">
- <!-- outside highlight -->
- <gradient type="vertical" x="width-2" y="2" width="1" height="height-4">
- <color value="shade/gtk:bg[SELECTED]/1.2"/>
- <color value="shade/gtk:bg[SELECTED]/1.0"/>
- </gradient>
- <gradient type="vertical" x="width-1" y="3" width="1" height="height-6">
- <color value="shade/gtk:bg[SELECTED]/1.2"/>
- <color value="shade/gtk:bg[SELECTED]/1.0"/>
- </gradient>
- <line color="shade/gtk:bg[SELECTED]/1.0" x1="2" y1="height-2"
x2="width-3" y2="height-2"/>
- <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"/>
+<draw_ops name="button_outline">
+ <tint color="#000000" alpha="0.45"
+ x="2" y="3" width="width-4" height="1"/>
+ <tint color="#000000" alpha="0.45"
+ x="2" y="height-4" width="width-4" height="1"/>
+ <tint color="#000000" alpha="0.45"
+ x="1" y="4" width="1" height="height-8"/>
+ <tint color="#000000" alpha="0.45"
+ x="width-2" y="4" width="1" height="height-8"/>
+
+ <tint color="#ffffff" alpha="0.4"
+ x="2" y="4" width="width-4" height="1"/>
+ <tint color="#ffffff" alpha="0.4"
+ x="2" y="height-5" width="width-4" height="1"/>
+ <tint color="#ffffff" alpha="0.4"
+ x="2" y="5" width="1" height="height-10"/>
+ <tint color="#ffffff" alpha="0.4"
+ x="width-3" y="5" width="1" height="height-10"/>
- <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 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.05" x1="2" y1="3" x2="2"
y2="height-4"/>
- <!-- inside shadow -->
- <line color="shade/gtk:bg[SELECTED]/0.8" x1="3" y1="height-3"
x2="width-4" y2="height-3"/>
-
- <!-- fill gradient -->
- <gradient type="vertical" x="3" y="3" width="width-6" height="height-6">
- <color value="shade/gtk:bg[SELECTED]/1.05"/>
- <color value="shade/gtk:bg[SELECTED]/0.85"/>
- </gradient>
+ <tint color="#000000" alpha="0.2"
+ x="2" y="4" width="1" height="1"/>
+ <tint color="#000000" alpha="0.2"
+ x="2" y="height-5" width="1" height="1"/>
+ <tint color="#000000" alpha="0.2"
+ x="width-3" y="4" width="1" height="1"/>
+ <tint color="#000000" alpha="0.2"
+ x="width-3" y="height-5" width="1" height="1"/>
</draw_ops>
-<draw_ops name="button_bg_unfocused">
- <!-- outside highlight -->
- <gradient type="vertical" x="width-2" y="2" width="1" height="height-4">
- <color value="shade/gtk:bg[NORMAL]/1.2"/>
- <color value="shade/gtk:bg[NORMAL]/1.05"/>
- </gradient>
- <gradient type="vertical" x="width-1" y="3" width="1" height="height-6">
- <color value="shade/gtk:bg[NORMAL]/1.2"/>
- <color value="shade/gtk:bg[NORMAL]/1.05"/>
- </gradient>
- <line color="shade/gtk:bg[NORMAL]/1.05" x1="2" y1="height-2"
x2="width-3" y2="height-2"/>
- <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="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="height-3"
x2="width-3" y2="height-3"/>
-
- <!-- inside highlight -->
- <line color="shade/gtk:bg[NORMAL]/1.25" 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"/>
- <!-- inside shadow -->
- <line color="shade/gtk:bg[NORMAL]/0.85" x1="3" y1="height-3"
x2="width-4" y2="height-3"/>
-
- <!-- fill gradient -->
- <gradient type="vertical" x="3" y="3" width="width-6" height="height-6">
- <color value="shade/gtk:bg[NORMAL]/1"/>
- <color value="shade/gtk:bg[NORMAL]/0.9"/>
+<draw_ops name="button_bg">
+ <gradient type="vertical" x="2" y="4" width="width - 4" height="height
/ 2 - 4">
+ <color value="shade/gtk:bg[SELECTED]/1.35"/>
+ <color value="shade/gtk:bg[SELECTED]/0.95"/>
+ </gradient>
+ <gradient type="vertical" x="2" y="height / 2" width="width - 4"
height="height / 2 - 3">
+ <color value="shade/gtk:bg[SELECTED]/0.70"/>
+ <color value="shade/gtk:bg[SELECTED]/0.85"/>
</gradient>
+
+ <include name="button_outline"/>
</draw_ops>
<draw_ops name="button_bg_prelight">
- <include name="button_bg"/>
- <tint color="shade/gtk:bg[SELECTED]/1.5" alpha="0.2"
- x="3" y="3" width="width-6" height="height-6"/>
+ <gradient type="vertical" x="2" y="4" width="width - 4" height="height
/ 2 - 4">
+ <color value="shade/gtk:bg[SELECTED]/1.45"/>
+ <color value="shade/gtk:bg[SELECTED]/1.05"/>
+ </gradient>
+ <gradient type="vertical" x="2" y="height / 2" width="width - 4"
height="height / 2 - 3">
+ <color value="shade/gtk:bg[SELECTED]/0.75"/>
+ <color value="shade/gtk:bg[SELECTED]/0.95"/>
+ </gradient>
+
+ <include name="button_outline"/>
</draw_ops>
<draw_ops name="button_bg_pressed">
- <!-- outside highlight -->
- <gradient type="vertical" x="width-2" y="2" width="1" height="height-4">
- <color value="shade/gtk:bg[SELECTED]/1.2"/>
- <color value="shade/gtk:bg[SELECTED]/1.0"/>
- </gradient>
- <gradient type="vertical" x="width-1" y="3" width="1" height="height-6">
- <color value="shade/gtk:bg[SELECTED]/1.2"/>
- <color value="shade/gtk:bg[SELECTED]/1.0"/>
- </gradient>
- <line color="shade/gtk:bg[SELECTED]/1.0" x1="2" y1="height-2"
x2="width-3" y2="height-2"/>
- <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="2" y1="height-3"
x2="width-3" y2="height-3"/>
+ <gradient type="vertical" x="2" y="4" width="width - 4" height="height
/ 2 - 4">
+ <color value="shade/gtk:bg[SELECTED]/1.15"/>
+ <color value="shade/gtk:bg[SELECTED]/0.75"/>
+ </gradient>
+ <gradient type="vertical" x="2" y="height / 2" width="width - 4"
height="height / 2 - 3">
+ <color value="shade/gtk:bg[SELECTED]/0.60"/>
+ <color value="shade/gtk:bg[SELECTED]/0.65"/>
+ </gradient>
- <!-- 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"/>
- <color value="shade/gtk:bg[SELECTED]/0.8"/>
+ <include name="button_outline"/>
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused">
+ <gradient type="vertical" x="2" y="4" width="width - 4" height="height
/ 2 - 4">
+ <color value="shade/gtk:bg[NORMAL]/1.3"/>
+ <color value="shade/gtk:bg[NORMAL]/1.0"/>
+ </gradient>
+ <gradient type="vertical" x="2" y="height / 2" width="width - 4"
height="height / 2 - 3">
+ <color value="shade/gtk:bg[NORMAL]/0.87"/>
+ <color value="shade/gtk:bg[NORMAL]/0.88"/>
</gradient>
- <line color="shade/gtk:bg[SELECTED]/0.8" x1="3" y1="height-3"
x2="width-5" y2="height-3"/>
+
+ <include name="button_outline"/>
</draw_ops>
<draw_ops name="button_bg_unfocused_prelight">
- <include name="button_bg_unfocused"/>
- <tint color="shade/gtk:bg[NORMAL]/1.5" alpha="0.3"
- x="3" y="3" width="width-6" height="height-6"/>
+ <gradient type="vertical" x="2" y="4" width="width - 4" height="height
/ 2 - 4">
+ <color value="shade/gtk:bg[NORMAL]/1.4"/>
+ <color value="shade/gtk:bg[NORMAL]/1.1"/>
+ </gradient>
+ <gradient type="vertical" x="2" y="height / 2" width="width - 4"
height="height / 2 - 3">
+ <color value="shade/gtk:bg[NORMAL]/0.87"/>
+ <color value="shade/gtk:bg[NORMAL]/0.98"/>
+ </gradient>
+
+ <include name="button_outline"/>
</draw_ops>
<draw_ops name="button_bg_unfocused_pressed">
- <!-- outside highlight -->
- <gradient type="vertical" x="width-2" y="2" width="1" height="height-4">
- <color value="shade/gtk:bg[NORMAL]/1.25"/>
- <color value="shade/gtk:bg[NORMAL]/1.05"/>
- </gradient>
- <gradient type="vertical" x="width-1" y="3" width="1" height="height-6">
- <color value="shade/gtk:bg[NORMAL]/1.25"/>
- <color value="shade/gtk:bg[NORMAL]/1.05"/>
- </gradient>
- <line color="shade/gtk:bg[NORMAL]/1.05" x1="2" y1="height-2"
x2="width-3" y2="height-2"/>
- <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="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="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 type="vertical" x="2" y="4" width="width - 4" height="height
/ 2 - 4">
+ <color value="shade/gtk:bg[NORMAL]/1.05"/>
+ <color value="shade/gtk:bg[NORMAL]/0.8"/>
+ </gradient>
+ <gradient type="vertical" x="2" y="height / 2" width="width - 4"
height="height / 2 - 3">
+ <color value="shade/gtk:bg[NORMAL]/0.65"/>
+ <color value="shade/gtk:bg[NORMAL]/0.65"/>
</gradient>
- <line color="shade/gtk:bg[NORMAL]/0.85" x1="3" y1="height-3"
x2="width-5" y2="height-3"/>
-</draw_ops>
-<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"/>
+ <include name="button_outline"/>
</draw_ops>
-<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"
+<draw_ops name="menu_button_icon">
+ <icon x="(width-mini_icon_width)/2-2"
+ y="(height-mini_icon_height)/2+1"
width="mini_icon_width" height="mini_icon_height"/>
</draw_ops>
@@ -541,7 +463,7 @@
<include name="menu_button_icon"/>
</draw_ops>
<draw_ops name="menu_button_unfocused">
- <include name="menu_button_icon_unfocused"/>
+ <include name="menu_button_icon"/>
</draw_ops>
<!--
@@ -777,6 +699,10 @@
<button function="maximize" state="prelight"
draw_ops="restore_button_unfocused_prelight"/>
</frame_style>
+<frame_style name="normal_maximized_shaded" geometry="normal_maximized"
parent="normal_maximized">
+ <piece position="entire_background"
draw_ops="bevel_maximized_unfocused_shaded"/>
+</frame_style>
+
<frame_style name="focused_maximized" geometry="normal_maximized"
parent="focused">
<piece position="entire_background" draw_ops="bevel_maximized"/>
<button function="maximize" state="normal" draw_ops="restore_button_normal"/>
@@ -784,6 +710,10 @@
<button function="maximize" state="prelight"
draw_ops="restore_button_prelight"/>
</frame_style>
+<frame_style name="focused_maximized_shaded" geometry="normal_maximized"
parent="focused_maximized">
+ <piece position="entire_background" draw_ops="bevel_maximized_shaded"/>
+</frame_style>
+
<frame_style name="border" geometry="border" parent="normal">
<piece position="entire_background" draw_ops="border"/>
<piece position="title" draw_ops="blank"/>
@@ -806,8 +736,8 @@
<frame focus="no" state="maximized" style="normal_maximized"/>
<frame focus="yes" state="shaded" style="focused_shaded"/>
<frame focus="no" state="shaded" style="normal_shaded"/>
- <frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/>
- <frame focus="no" state="maximized_and_shaded" style="normal_maximized"/>
+ <frame focus="yes" state="maximized_and_shaded"
style="focused_maximized_shaded"/>
+ <frame focus="no" state="maximized_and_shaded"
style="normal_maximized_shaded"/>
</frame_style_set>
<frame_style_set name="utility" parent="normal">
gnome-themes.recipe: changed
Index: gnome-themes.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- gnome-themes.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/2.13.90-0.1
+++ gnome-themes.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/2.13.90-0.2
@@ -15,6 +15,7 @@
def unpack(r):
GnomePackageRecipe.unpack(r)
r.addPatch('icons.patch')
+ r.addPatch('clearlooks2.patch')
def install(r):
r.MakePathsInstall()
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
