summaryrefslogtreecommitdiff
path: root/src/themes
diff options
context:
space:
mode:
authorJames M. Cape <jcape@ignore-your.tv>2004-01-24 16:20:41 +0000
committerJames M. Cape <jcape@src.gnome.org>2004-01-24 16:20:41 +0000
commit4b3b7063698949b7c476016c3b6cb959e10dee8f (patch)
treeef8ff85c1ad15f377d81f744a2744889673f0d02 /src/themes
parent595cbe2ac0f37666d27b2133a7e8f4499a13e435 (diff)
downloadmetacity-4b3b7063698949b7c476016c3b6cb959e10dee8f.tar.gz
metacity-4b3b7063698949b7c476016c3b6cb959e10dee8f.tar.bz2
Updated this theme.
2004-01-24 James M. Cape <jcape@ignore-your.tv> * src/themes/Esco/metacity-theme-1.xml: Updated this theme.
Diffstat (limited to 'src/themes')
-rw-r--r--src/themes/Esco/metacity-theme-1.xml976
1 files changed, 685 insertions, 291 deletions
diff --git a/src/themes/Esco/metacity-theme-1.xml b/src/themes/Esco/metacity-theme-1.xml
index 818532f..fffd9d9 100644
--- a/src/themes/Esco/metacity-theme-1.xml
+++ b/src/themes/Esco/metacity-theme-1.xml
@@ -16,9 +16,9 @@
<distance name="left_titlebar_edge" value="5"/>
<distance name="right_titlebar_edge" value="5"/>
<aspect_ratio name="button" value="1.0"/>
- <distance name="title_vertical_pad" value="2"/>
- <border name="title_border" left="0" right="0" top="4" bottom="4"/>
- <border name="button_border" left="0" right="0" top="4" bottom="4"/>
+ <distance name="title_vertical_pad" value="1"/>
+ <border name="title_border" left="5" right="5" top="3" bottom="2"/>
+ <border name="button_border" left="0" right="0" top="3" bottom="2"/>
</frame_geometry>
<!-- strip borders off the normal geometry -->
@@ -28,20 +28,21 @@
<distance name="bottom_height" value="0"/>
<distance name="left_titlebar_edge" value="0"/>
<distance name="right_titlebar_edge" value="0"/>
- <border name="title_border" left="0" right="0" top="0" bottom="3"/>
- <border name="button_border" left="0" right="0" top="0" bottom="3"/>
+ <distance name="title_vertical_pad" value="2"/>
+ <border name="title_border" left="5" right="5" top="0" bottom="0"/>
+ <border name="button_border" left="0" right="0" top="0" bottom="0"/>
</frame_geometry>
-<frame_geometry name="utility" title_scale="xx-small">
- <distance name="left_width" value="3"/>
- <distance name="right_width" value="3"/>
- <distance name="bottom_height" value="4"/>
- <distance name="left_titlebar_edge" value="3"/>
- <distance name="right_titlebar_edge" value="3"/>
+<frame_geometry name="utility" title_scale="small">
+ <distance name="left_width" value="1"/>
+ <distance name="right_width" value="1"/>
+ <distance name="bottom_height" value="5"/>
+ <distance name="left_titlebar_edge" value="2"/>
+ <distance name="right_titlebar_edge" value="2"/>
<aspect_ratio name="button" value="1.0"/>
- <distance name="title_vertical_pad" value="1"/>
- <border name="title_border" left="0" right="0" top="3" bottom="3"/>
- <border name="button_border" left="0" right="0" top="2" bottom="2"/>
+ <distance name="title_vertical_pad" value="3"/>
+ <border name="title_border" left="2" right="2" top="0" bottom="0"/>
+ <border name="button_border" left="0" right="0" top="2" bottom="0"/>
</frame_geometry>
<frame_geometry name="border" has_title="false">
@@ -58,14 +59,11 @@
</frame_geometry>
<!-- define constants -->
-<constant name="ArrowWidth" value="7"/>
-<constant name="ArrowHeight" value="5"/>
<constant name="ButtonIPad" value="3"/>
-<constant name="ThickLineWidth" value="3"/>
<constant name="IconTitleSpacing" value="8"/>
<!-- Button Outlines -->
-<draw_ops name="button_normal_bg">
+<draw_ops name="button_prelight_bg">
<gtk_box state="prelight" shadow="out" x="0" y="0" width="width"
height="height"/>
</draw_ops>
@@ -75,321 +73,662 @@
height="height"/>
</draw_ops>
-<!-- Button Icons -->
-<draw_ops name="menu_button">
-
- <clip x="5" y="5" width="width - 10" height="height - 10"/>
- <rectangle color="gtk:fg[INSENSITIVE]" filled="true"
- x="ButtonIPad"
- y="ButtonIPad"
- width="width - ButtonIPad * 2 - 1"
- height="height - ButtonIPad * 2 - 1"/>
- <line color="gtk:bg[INSENSITIVE]" width="16"
- x1="width * 1.5 + 2"
- y1="0"
- x2="0"
- y2="height * 1.5 + 2"/>
-</draw_ops>
-<draw_ops name="menu_button_focused">
- <clip x="5" y="5" width="width - 10" height="height - 10"/>
- <rectangle color="gtk:fg[NORMAL]" filled="true"
- x="ButtonIPad"
- y="ButtonIPad"
- width="width - ButtonIPad * 2 - 1"
- height="height - ButtonIPad * 2 - 1"/>
- <line color="gtk:bg[PRELIGHT]" width="16"
- x1="width * 1.5 + 2"
- y1="0"
- x2="0"
- y2="height * 1.5 + 2"/>
-</draw_ops>
-<draw_ops name="menu_button_pressed">
- <include name="button_pressed_bg"/>
- <clip x="5" y="5" width="width - 10" height="height - 10"/>
- <rectangle color="gtk:fg[ACTIVE]" filled="true"
- x="ButtonIPad"
- y="ButtonIPad"
- width="width - ButtonIPad * 2 - 1"
- height="height - ButtonIPad * 2 - 1"/>
- <line color="gtk:bg[ACTIVE]" width="16"
- x1="width * 1.5 + 2"
- y1="0"
- x2="0"
- y2="height * 1.5 + 2"/>
+<draw_ops name="right_button_normal_bg">
+ <rectangle color="#ffffff" filled="true" x="0" y="0" width="width" height="height"/>
</draw_ops>
+<!-- Button Icons -->
+
+<!-- Minimize Button -->
<draw_ops name="minimize_button">
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
+ <rectangle color="gtk:dark[NORMAL]" filled="true"
x="ButtonIPad"
- y="height - ButtonIPad - 4"
- width="width - ButtonIPad * 2 - 1"
- height="3"/>
+ y="height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4) - 1"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4"/>
</draw_ops>
<draw_ops name="minimize_button_focused">
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
+ <rectangle color="gtk:fg[SELECTED]" filled="true"
x="ButtonIPad"
- y="ButtonIPad"
- width="width - ButtonIPad * 2 - 1"
- height="height - ButtonIPad * 2 - 1"/>
- <rectangle color="gtk:fg[NORMAL]" filled="false"
+ y="height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4) - 1"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4"/>
+</draw_ops>
+<draw_ops name="minimize_button_prelight">
+ <include name="button_prelight_bg"/>
+ <rectangle color="gtk:dark[PRELIGHT]" filled="true"
+ x="ButtonIPad + 1"
+ y="height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4)"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4 + 1"/>
+ <rectangle color="gtk:fg[PRELIGHT]" filled="false"
x="ButtonIPad"
- y="height - ButtonIPad - 4"
- width="width - ButtonIPad * 2 - 1"
- height="3"/>
- <line color="gtk:fg[INSENSITIVE]" width="2"
- x1="ButtonIPad + 1"
- y1="height - ButtonIPad - 2"
- x2="width - ButtonIPad - 1"
- y2="height - ButtonIPad - 2"/>
+ y="height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4) - 1"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4"/>
</draw_ops>
<draw_ops name="minimize_button_pressed">
<include name="button_pressed_bg"/>
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
- x="ButtonIPad"
- y="ButtonIPad"
- width="width - ButtonIPad * 2 - 1"
- height="height - ButtonIPad * 2 - 1"/>
+ <rectangle color="gtk:dark[ACTIVE]" filled="true"
+ x="ButtonIPad + 1"
+ y="height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4)"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4 + 1"/>
<rectangle color="gtk:fg[ACTIVE]" filled="false"
x="ButtonIPad"
- y="height - ButtonIPad - 4"
- width="width - ButtonIPad * 2 - 1"
- height="3"/>
- <line color="gtk:fg[INSENSITIVE]" width="2"
- x1="ButtonIPad + 1"
- y1="height - ButtonIPad - 2"
- x2="width - ButtonIPad - 1"
- y2="height - ButtonIPad - 2"/>
+ y="height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4) - 1"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4"/>
</draw_ops>
+<!-- Maximize Button -->
<draw_ops name="maximize_button">
- <line color="gtk:fg[INSENSITIVE]"
- x1="ButtonIPad"
- y1="ButtonIPad + 3"
- x2="width - ButtonIPad - 1"
- y2="ButtonIPad + 3"/>
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
+ <rectangle color="gtk:dark[NORMAL]" filled="false"
+ x="ButtonIPad"
+ y="ButtonIPad"
+ width="width - (ButtonIPad + 1) * 2"
+ height="height - (ButtonIPad + 1) * 2"/>
+ <rectangle color="gtk:dark[NORMAL]" filled="true"
x="ButtonIPad"
y="ButtonIPad"
- width="width-ButtonIPad*2-1"
- height="height-ButtonIPad*2-1"/>
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4"/>
</draw_ops>
<draw_ops name="maximize_button_focused">
- <line color="gtk:fg[INSENSITIVE]" width="2"
- x1="ButtonIPad + 1"
- y1="ButtonIPad + 2"
- x2="width - ButtonIPad - 1"
- y2="ButtonIPad + 2"/>
- <line color="gtk:fg[NORMAL]"
- x1="ButtonIPad"
- y1="ButtonIPad + 3"
- x2="width - ButtonIPad - 1"
- y2="ButtonIPad + 3"/>
- <rectangle color="gtk:fg[NORMAL]" filled="false"
+ <rectangle color="gtk:fg[SELECTED]" filled="false"
x="ButtonIPad"
y="ButtonIPad"
- width="width-ButtonIPad*2-1"
- height="height-ButtonIPad*2-1"/>
+ width="width - (ButtonIPad + 1) * 2"
+ height="height - (ButtonIPad + 1) * 2"/>
+ <rectangle color="gtk:fg[SELECTED]" filled="true"
+ x="ButtonIPad"
+ y="ButtonIPad"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4"/>
+</draw_ops>
+<draw_ops name="maximize_button_prelight">
+ <include name="button_prelight_bg"/>
+ <rectangle color="gtk:dark[PRELIGHT]" filled="false"
+ x="ButtonIPad + 1"
+ y="ButtonIPad + 1"
+ width="width - (ButtonIPad + 1) * 2"
+ height="height - (ButtonIPad + 1) * 2"/>
+ <rectangle color="gtk:dark[PRELIGHT]" filled="true"
+ x="ButtonIPad + 1"
+ y="ButtonIPad + 1"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4 + 1"/>
+ <rectangle color="gtk:fg[PRELIGHT]" filled="false"
+ x="ButtonIPad"
+ y="ButtonIPad"
+ width="width - (ButtonIPad + 1) * 2"
+ height="height - (ButtonIPad + 1) * 2"/>
+ <rectangle color="gtk:fg[PRELIGHT]" filled="false"
+ x="ButtonIPad"
+ y="ButtonIPad"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4"/>
</draw_ops>
<draw_ops name="maximize_button_pressed">
<include name="button_pressed_bg"/>
- <line color="gtk:fg[INSENSITIVE]" width="2"
- x1="ButtonIPad + 1"
- y1="ButtonIPad + 2"
- x2="width - ButtonIPad - 1"
- y2="ButtonIPad + 2"/>
- <line color="gtk:fg[ACTIVE]"
- x1="ButtonIPad"
- y1="ButtonIPad + 3"
- x2="width - ButtonIPad - 1"
- y2="ButtonIPad + 3"/>
+ <rectangle color="gtk:dark[ACTIVE]" filled="false"
+ x="ButtonIPad + 1"
+ y="ButtonIPad + 1"
+ width="width - (ButtonIPad + 1) * 2"
+ height="height - (ButtonIPad + 1) * 2"/>
+ <rectangle color="gtk:dark[ACTIVE]" filled="true"
+ x="ButtonIPad + 1"
+ y="ButtonIPad + 1"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4 + 1"/>
<rectangle color="gtk:fg[ACTIVE]" filled="false"
x="ButtonIPad"
y="ButtonIPad"
- width="width-ButtonIPad*2-1"
- height="height-ButtonIPad*2-1"/>
+ width="width - (ButtonIPad + 1) * 2"
+ height="height - (ButtonIPad + 1) * 2"/>
+ <rectangle color="gtk:fg[ACTIVE]" filled="false"
+ x="ButtonIPad"
+ y="ButtonIPad"
+ width="width - (ButtonIPad + 1) * 2"
+ height="(height - (ButtonIPad + 1) * 2) * 0.4"/>
</draw_ops>
+<!-- UnMaximize Button -->
<draw_ops name="restore_button">
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
+ <rectangle color="gtk:dark[NORMAL]" filled="false"
x="ButtonIPad"
y="ButtonIPad"
- width="width - (ButtonIPad * 2) - 1"
- height="height - (ButtonIPad * 2) - 1"/>
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:dark[NORMAL]" filled="true"
x="ButtonIPad"
- y="ButtonIPad + 4"
- width="width - (ButtonIPad * 2) - 1 - 4"
- height="height - (ButtonIPad * 2) - 1 - 4"/>
- <line color="gtk:fg[INSENSITIVE]"
- x1="ButtonIPad"
- y1="ButtonIPad + 3 + 4"
- x2="width - (ButtonIPad * 2) - 3"
- y2="ButtonIPad + 3 + 4"/>
+ y="ButtonIPad"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
+ <rectangle color="gtk:dark[NORMAL]" filled="false"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:dark[NORMAL]" filled="true"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
</draw_ops>
<draw_ops name="restore_button_focused">
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
+ <rectangle color="gtk:fg[SELECTED]" filled="false"
x="ButtonIPad"
y="ButtonIPad"
- width="width - (ButtonIPad * 2) - 1"
- height="height - (ButtonIPad * 2) - 1"/>
- <rectangle color="gtk:fg[NORMAL]" filled="false"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:fg[SELECTED]" filled="true"
x="ButtonIPad"
- y="ButtonIPad + 4"
- width="width - (ButtonIPad * 2) - 1 - 4"
- height="height - (ButtonIPad * 2) - 1 - 4"/>
- <line color="gtk:fg[NORMAL]"
- x1="ButtonIPad"
- y1="ButtonIPad + 3 + 4"
- x2="width - (ButtonIPad * 2) - 3"
- y2="ButtonIPad + 3 + 4"/>
- <line color="gtk:fg[INSENSITIVE]" width="2"
- x1="ButtonIPad + 1"
- y1="ButtonIPad + 4 + 2"
- x2="width - (ButtonIPad * 2) - 2"
- y2="ButtonIPad + 4 + 2"/>
+ y="ButtonIPad"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
+ <rectangle color="gtk:fg[SELECTED]" filled="false"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:fg[SELECTED]" filled="true"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
+</draw_ops>
+<draw_ops name="restore_button_prelight">
+ <include name="button_prelight_bg"/>
+ <rectangle color="gtk:dark[PRELIGHT]" filled="false"
+ x="ButtonIPad + 1"
+ y="ButtonIPad + 1"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:dark[PRELIGHT]" filled="true"
+ x="ButtonIPad + 1"
+ y="ButtonIPad + 1"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
+ <rectangle color="gtk:dark[PRELIGHT]" filled="false"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33 + 1"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33 + 1"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:dark[PRELIGHT]" filled="true"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33 + 1"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33 + 1"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
+ <rectangle color="gtk:fg[PRELIGHT]" filled="false"
+ x="ButtonIPad"
+ y="ButtonIPad"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:fg[PRELIGHT]" filled="true"
+ x="ButtonIPad"
+ y="ButtonIPad"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
+ <rectangle color="gtk:fg[PRELIGHT]" filled="false"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:fg[PRELIGHT]" filled="true"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
</draw_ops>
<draw_ops name="restore_button_pressed">
<include name="button_pressed_bg"/>
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
+ <rectangle color="gtk:dark[ACTIVE]" filled="false"
+ x="ButtonIPad + 1"
+ y="ButtonIPad + 1"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:dark[ACTIVE]" filled="true"
+ x="ButtonIPad + 1"
+ y="ButtonIPad + 1"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
+ <rectangle color="gtk:dark[ACTIVE]" filled="false"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33 + 1"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33 + 1"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:dark[ACTIVE]" filled="true"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33 + 1"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33 + 1"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
+ <rectangle color="gtk:fg[ACTIVE]" filled="false"
x="ButtonIPad"
y="ButtonIPad"
- width="width - (ButtonIPad * 2) - 1"
- height="height - (ButtonIPad * 2) - 1"/>
- <rectangle color="gtk:fg[ACTIVE]" filled="false"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:fg[ACTIVE]" filled="true"
x="ButtonIPad"
- y="ButtonIPad + 4"
- width="width - (ButtonIPad * 2) - 1 - 4"
- height="height - (ButtonIPad * 2) - 1 - 4"/>
- <line color="gtk:fg[ACTIVE]"
- x1="ButtonIPad"
- y1="ButtonIPad + 3 + 4"
- x2="width - (ButtonIPad * 2) - 3"
- y2="ButtonIPad + 3 + 4"/>
- <line color="gtk:fg[INSENSITIVE]" width="2"
- x1="ButtonIPad + 1"
- y1="ButtonIPad + 4 + 2"
- x2="width - (ButtonIPad * 2) - 2"
- y2="ButtonIPad + 4 + 2"/>
+ y="ButtonIPad"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
+ <rectangle color="gtk:fg[ACTIVE]" filled="false"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="(height - (ButtonIPad + 1) * 2) * 0.67"/>
+ <rectangle color="gtk:fg[ACTIVE]" filled="true"
+ x="ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33"
+ y="ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33"
+ width="(width - (ButtonIPad + 1) * 2) * 0.67"
+ height="((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67"/>
</draw_ops>
-<draw_ops name="close_button">
- <line color="gtk:fg[INSENSITIVE]" width="2"
+<!-- Menu Button -->
+<draw_ops name="menu_button">
+ <line color="gtk:dark[NORMAL]" width="3"
x1="ButtonIPad + 1"
+ y1="ButtonIPad"
+ x2="ButtonIPad + 1"
+ y2="height - ButtonIPad - 3"/>
+ <line color="gtk:dark[NORMAL]" width="3"
+ x1="ButtonIPad"
+ y1="height - ButtonIPad - 5"
+ x2="width - ButtonIPad - 2"
+ y2="height - ButtonIPad - 5"/>
+ <line color="gtk:dark[NORMAL]" width="1"
+ x1="ButtonIPad"
+ y1="height - ButtonIPad - 5"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 5"/>
+ <line color="gtk:dark[NORMAL]" width="1"
+ x1="width - ButtonIPad - 4"
+ y1="height - ButtonIPad - 3 - 4"
+ x2="width - ButtonIPad - 4"
+ y2="height - ButtonIPad - 2"/>
+ <line color="gtk:dark[NORMAL]" width="1"
+ x1="width - ButtonIPad - 5"
+ y1="height - ButtonIPad - 3 - 5"
+ x2="width - ButtonIPad - 5"
+ y2="height - ButtonIPad - 1"/>
+</draw_ops>
+<draw_ops name="menu_button_focused">
+ <line color="gtk:fg[SELECTED]" width="3"
+ x1="ButtonIPad + 1"
+ y1="ButtonIPad"
+ x2="ButtonIPad + 1"
+ y2="height - ButtonIPad - 3"/>
+ <line color="gtk:fg[SELECTED]" width="3"
+ x1="ButtonIPad"
+ y1="height - ButtonIPad - 5"
+ x2="width - ButtonIPad - 2"
+ y2="height - ButtonIPad - 5"/>
+ <line color="gtk:fg[SELECTED]" width="1"
+ x1="ButtonIPad"
+ y1="height - ButtonIPad - 5"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 5"/>
+ <line color="gtk:fg[SELECTED]" width="1"
+ x1="width - ButtonIPad - 4"
+ y1="height - ButtonIPad - 3 - 4"
+ x2="width - ButtonIPad - 4"
+ y2="height - ButtonIPad - 2"/>
+ <line color="gtk:fg[SELECTED]" width="1"
+ x1="width - ButtonIPad - 5"
+ y1="height - ButtonIPad - 3 - 5"
+ x2="width - ButtonIPad - 5"
+ y2="height - ButtonIPad - 1"/>
+</draw_ops>
+<draw_ops name="menu_button_prelight">
+ <include name="button_prelight_bg"/>
+ <line color="gtk:dark[PRELIGHT]" width="3"
+ x1="ButtonIPad + 1 + 1"
y1="ButtonIPad + 1"
+ x2="ButtonIPad + 1 + 1"
+ y2="height - ButtonIPad - 3 + 1"/>
+ <line color="gtk:dark[PRELIGHT]" width="3"
+ x1="ButtonIPad + 1"
+ y1="height - ButtonIPad - 5 + 1"
+ x2="width - ButtonIPad - 2 + 1"
+ y2="height - ButtonIPad - 5 + 1"/>
+ <line color="gtk:dark[PRELIGHT]" width="1"
+ x1="ButtonIPad + 1"
+ y1="height - ButtonIPad - 5 + 1"
+ x2="width - ButtonIPad - 1 + 1"
+ y2="height - ButtonIPad - 5 + 1"/>
+ <line color="gtk:dark[PRELIGHT]" width="1"
+ x1="width - ButtonIPad - 4 + 1"
+ y1="height - ButtonIPad - 3 - 4 + 1"
+ x2="width - ButtonIPad - 4 + 1"
+ y2="height - ButtonIPad - 2 + 1"/>
+ <line color="gtk:dark[PRELIGHT]" width="1"
+ x1="width - ButtonIPad - 5 + 1"
+ y1="height - ButtonIPad - 3 - 5 + 1"
+ x2="width - ButtonIPad - 5 + 1"
+ y2="height - ButtonIPad - 1 + 1"/>
+ <line color="gtk:fg[PRELIGHT]" width="3"
+ x1="ButtonIPad + 1"
+ y1="ButtonIPad"
+ x2="ButtonIPad + 1"
+ y2="height - ButtonIPad - 3"/>
+ <line color="gtk:fg[PRELIGHT]" width="3"
+ x1="ButtonIPad"
+ y1="height - ButtonIPad - 5"
x2="width - ButtonIPad - 2"
+ y2="height - ButtonIPad - 5"/>
+ <line color="gtk:fg[PRELIGHT]" width="1"
+ x1="ButtonIPad"
+ y1="height - ButtonIPad - 5"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 5"/>
+ <line color="gtk:fg[PRELIGHT]" width="1"
+ x1="width - ButtonIPad - 4"
+ y1="height - ButtonIPad - 3 - 4"
+ x2="width - ButtonIPad - 4"
y2="height - ButtonIPad - 2"/>
- <line color="gtk:fg[INSENSITIVE]" width="2"
+ <line color="gtk:fg[PRELIGHT]" width="1"
+ x1="width - ButtonIPad - 5"
+ y1="height - ButtonIPad - 3 - 5"
+ x2="width - ButtonIPad - 5"
+ y2="height - ButtonIPad - 1"/>
+</draw_ops>
+<draw_ops name="menu_button_pressed">
+ <include name="button_pressed_bg"/>
+ <line color="gtk:dark[ACTIVE]" width="3"
+ x1="ButtonIPad + 1 + 1"
+ y1="ButtonIPad + 1"
+ x2="ButtonIPad + 1 + 1"
+ y2="height - ButtonIPad - 3 + 1"/>
+ <line color="gtk:dark[ACTIVE]" width="3"
+ x1="ButtonIPad + 1"
+ y1="height - ButtonIPad - 5 + 1"
+ x2="width - ButtonIPad - 2 + 1"
+ y2="height - ButtonIPad - 5 + 1"/>
+ <line color="gtk:dark[ACTIVE]" width="1"
x1="ButtonIPad + 1"
- y1="height - ButtonIPad - 2"
+ y1="height - ButtonIPad - 5 + 1"
+ x2="width - ButtonIPad - 1 + 1"
+ y2="height - ButtonIPad - 5 + 1"/>
+ <line color="gtk:dark[ACTIVE]" width="1"
+ x1="width - ButtonIPad - 4 + 1"
+ y1="height - ButtonIPad - 3 - 4 + 1"
+ x2="width - ButtonIPad - 4 + 1"
+ y2="height - ButtonIPad - 2 + 1"/>
+ <line color="gtk:dark[ACTIVE]" width="1"
+ x1="width - ButtonIPad - 5 + 1"
+ y1="height - ButtonIPad - 3 - 5 + 1"
+ x2="width - ButtonIPad - 5 + 1"
+ y2="height - ButtonIPad - 1 + 1"/>
+ <line color="gtk:fg[ACTIVE]" width="3"
+ x1="ButtonIPad + 1"
+ y1="ButtonIPad"
+ x2="ButtonIPad + 1"
+ y2="height - ButtonIPad - 3"/>
+ <line color="gtk:fg[ACTIVE]" width="3"
+ x1="ButtonIPad"
+ y1="height - ButtonIPad - 5"
x2="width - ButtonIPad - 2"
- y2="ButtonIPad + 1"/>
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
- x="width - ButtonIPad - 3"
- y="height - ButtonIPad - 3"
- width="1"
- height="1"/>
- <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
- x="width - ButtonIPad - 3"
- y="ButtonIPad + 1"
- width="1"
- height="1"/>
+ y2="height - ButtonIPad - 5"/>
+ <line color="gtk:fg[ACTIVE]" width="1"
+ x1="ButtonIPad"
+ y1="height - ButtonIPad - 5"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 5"/>
+ <line color="gtk:fg[ACTIVE]" width="1"
+ x1="width - ButtonIPad - 4"
+ y1="height - ButtonIPad - 3 - 4"
+ x2="width - ButtonIPad - 4"
+ y2="height - ButtonIPad - 2"/>
+ <line color="gtk:fg[ACTIVE]" width="1"
+ x1="width - ButtonIPad - 5"
+ y1="height - ButtonIPad - 3 - 5"
+ x2="width - ButtonIPad - 5"
+ y2="height - ButtonIPad - 1"/>
+</draw_ops>
+
+<!-- Close Button -->
+<draw_ops name="close_button">
+ <line color="gtk:dark[NORMAL]" width="1"
+ x1="ButtonIPad"
+ y1="ButtonIPad"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 1"/>
+ <line color="gtk:dark[NORMAL]" width="1"
+ x1="ButtonIPad + 1"
+ y1="ButtonIPad"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 1 - 1"/>
+ <line color="gtk:dark[NORMAL]" width="1"
+ x1="ButtonIPad"
+ y1="ButtonIPad + 1"
+ x2="width - ButtonIPad - 1 - 1"
+ y2="height - ButtonIPad - 1"/>
+
+ <line color="gtk:dark[NORMAL]" width="1"
+ x1="ButtonIPad"
+ y1="height - 1 - ButtonIPad - 1"
+ x2="width - 1 - ButtonIPad"
+ y2="ButtonIPad - 1"/>
+ <line color="gtk:dark[NORMAL]" width="1"
+ x1="ButtonIPad + 1"
+ y1="height - 1 - ButtonIPad - 1"
+ x2="width - 1 - ButtonIPad"
+ y2="ButtonIPad"/>
+ <line color="gtk:dark[NORMAL]" width="1"
+ x1="ButtonIPad"
+ y1="height - 1 - ButtonIPad - 1 - 1"
+ x2="width - 1 - ButtonIPad - 1"
+ y2="ButtonIPad - 1"/>
</draw_ops>
<draw_ops name="close_button_focused">
- <line color="gtk:fg[NORMAL]" width="2"
+ <line color="gtk:fg[SELECTED]" width="1"
+ x1="ButtonIPad"
+ y1="ButtonIPad"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 1"/>
+ <line color="gtk:fg[SELECTED]" width="1"
x1="ButtonIPad + 1"
+ y1="ButtonIPad"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 1 - 1"/>
+ <line color="gtk:fg[SELECTED]" width="1"
+ x1="ButtonIPad"
y1="ButtonIPad + 1"
- x2="width - ButtonIPad - 2"
- y2="height - ButtonIPad - 2"/>
+ x2="width - ButtonIPad - 1 - 1"
+ y2="height - ButtonIPad - 1"/>
- <line color="gtk:fg[NORMAL]" width="2"
+ <line color="gtk:fg[SELECTED]" width="1"
+ x1="ButtonIPad"
+ y1="height - 1 - ButtonIPad - 1"
+ x2="width - 1 - ButtonIPad"
+ y2="ButtonIPad - 1"/>
+ <line color="gtk:fg[SELECTED]" width="1"
x1="ButtonIPad + 1"
- y1="height - ButtonIPad - 2"
- x2="width - ButtonIPad - 2"
+ y1="height - 1 - ButtonIPad - 1"
+ x2="width - 1 - ButtonIPad"
+ y2="ButtonIPad"/>
+ <line color="gtk:fg[SELECTED]" width="1"
+ x1="ButtonIPad"
+ y1="height - 1 - ButtonIPad - 1 - 1"
+ x2="width - 1 - ButtonIPad - 1"
+ y2="ButtonIPad - 1"/>
+</draw_ops>
+<draw_ops name="close_button_prelight">
+ <include name="button_prelight_bg"/>
+ <line color="gtk:dark[PRELIGHT]" width="1"
+ x1="ButtonIPad + 1"
+ y1="ButtonIPad + 1"
+ x2="width - ButtonIPad - 1 + 1"
+ y2="height - ButtonIPad - 1 + 1"/>
+ <line color="gtk:dark[PRELIGHT]" width="1"
+ x1="ButtonIPad + 1 + 1"
+ y1="ButtonIPad + 1"
+ x2="width - ButtonIPad - 1 + 1"
+ y2="height - ButtonIPad - 1 - 1 + 1"/>
+ <line color="gtk:dark[PRELIGHT]" width="1"
+ x1="ButtonIPad + 1"
+ y1="ButtonIPad + 1 + 1"
+ x2="width - ButtonIPad - 1 - 1 + 1"
+ y2="height - ButtonIPad - 1 + 1"/>
+
+ <line color="gtk:dark[PRELIGHT]" width="1"
+ x1="ButtonIPad + 1"
+ y1="height - 1 - ButtonIPad - 1 + 1"
+ x2="width - 1 - ButtonIPad + 1"
+ y2="ButtonIPad - 1 + 1"/>
+ <line color="gtk:dark[PRELIGHT]" width="1"
+ x1="ButtonIPad + 1 + 1"
+ y1="height - 1 - ButtonIPad - 1 + 1"
+ x2="width - 1 - ButtonIPad + 1"
y2="ButtonIPad + 1"/>
- <rectangle color="gtk:fg[NORMAL]" filled="false"
- x="width - ButtonIPad - 3"
- y="height - ButtonIPad - 3"
- width="1"
- height="1"/>
- <rectangle color="gtk:fg[NORMAL]" filled="false"
- x="width - ButtonIPad - 3"
- y="ButtonIPad + 1"
- width="1"
- height="1"/>
+ <line color="gtk:dark[PRELIGHT]" width="1"
+ x1="ButtonIPad + 1"
+ y1="height - 1 - ButtonIPad - 1 - 1 + 1"
+ x2="width - 1 - ButtonIPad - 1 + 1"
+ y2="ButtonIPad - 1 + 1"/>
+
+ <line color="gtk:fg[PRELIGHT]" width="1"
+ x1="ButtonIPad"
+ y1="ButtonIPad"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 1"/>
+ <line color="gtk:fg[PRELIGHT]" width="1"
+ x1="ButtonIPad + 1"
+ y1="ButtonIPad"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 1 - 1"/>
+ <line color="gtk:fg[PRELIGHT]" width="1"
+ x1="ButtonIPad"
+ y1="ButtonIPad + 1"
+ x2="width - ButtonIPad - 1 - 1"
+ y2="height - ButtonIPad - 1"/>
+
+ <line color="gtk:fg[PRELIGHT]" width="1"
+ x1="ButtonIPad"
+ y1="height - 1 - ButtonIPad - 1"
+ x2="width - 1 - ButtonIPad"
+ y2="ButtonIPad - 1"/>
+ <line color="gtk:fg[PRELIGHT]" width="1"
+ x1="ButtonIPad + 1"
+ y1="height - 1 - ButtonIPad - 1"
+ x2="width - 1 - ButtonIPad"
+ y2="ButtonIPad"/>
+ <line color="gtk:fg[PRELIGHT]" width="1"
+ x1="ButtonIPad"
+ y1="height - 1 - ButtonIPad - 1 - 1"
+ x2="width - 1 - ButtonIPad - 1"
+ y2="ButtonIPad - 1"/>
</draw_ops>
<draw_ops name="close_button_pressed">
<include name="button_pressed_bg"/>
- <line color="gtk:fg[ACTIVE]" width="2"
+ <line color="gtk:dark[ACTIVE]" width="1"
x1="ButtonIPad + 1"
y1="ButtonIPad + 1"
- x2="width - ButtonIPad - 2"
- y2="height - ButtonIPad - 2"/>
+ x2="width - ButtonIPad - 1 + 1"
+ y2="height - ButtonIPad - 1 + 1"/>
+ <line color="gtk:dark[ACTIVE]" width="1"
+ x1="ButtonIPad + 1 + 1"
+ y1="ButtonIPad + 1"
+ x2="width - ButtonIPad - 1 + 1"
+ y2="height - ButtonIPad - 1 - 1 + 1"/>
+ <line color="gtk:dark[ACTIVE]" width="1"
+ x1="ButtonIPad + 1"
+ y1="ButtonIPad + 1 + 1"
+ x2="width - ButtonIPad - 1 - 1 + 1"
+ y2="height - ButtonIPad - 1 + 1"/>
- <line color="gtk:fg[ACTIVE]" width="2"
+ <line color="gtk:dark[ACTIVE]" width="1"
x1="ButtonIPad + 1"
- y1="height - ButtonIPad - 2"
- x2="width - ButtonIPad - 2"
+ y1="height - 1 - ButtonIPad - 1 + 1"
+ x2="width - 1 - ButtonIPad + 1"
+ y2="ButtonIPad - 1 + 1"/>
+ <line color="gtk:dark[ACTIVE]" width="1"
+ x1="ButtonIPad + 1 + 1"
+ y1="height - 1 - ButtonIPad - 1 + 1"
+ x2="width - 1 - ButtonIPad + 1"
y2="ButtonIPad + 1"/>
- <rectangle color="gtk:fg[ACTIVE]" filled="false"
- x="width - ButtonIPad - 3"
- y="height - ButtonIPad - 3"
- width="1"
- height="1"/>
- <rectangle color="gtk:fg[ACTIVE]" filled="false"
- x="width - ButtonIPad - 3"
- y="ButtonIPad + 1"
- width="1"
- height="1"/>
+ <line color="gtk:dark[ACTIVE]" width="1"
+ x1="ButtonIPad + 1"
+ y1="height - 1 - ButtonIPad - 1 - 1 + 1"
+ x2="width - 1 - ButtonIPad - 1 + 1"
+ y2="ButtonIPad - 1 + 1"/>
+
+ <line color="gtk:fg[ACTIVE]" width="1"
+ x1="ButtonIPad"
+ y1="ButtonIPad"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 1"/>
+ <line color="gtk:fg[ACTIVE]" width="1"
+ x1="ButtonIPad + 1"
+ y1="ButtonIPad"
+ x2="width - ButtonIPad - 1"
+ y2="height - ButtonIPad - 1 - 1"/>
+ <line color="gtk:fg[ACTIVE]" width="1"
+ x1="ButtonIPad"
+ y1="ButtonIPad + 1"
+ x2="width - ButtonIPad - 1 - 1"
+ y2="height - ButtonIPad - 1"/>
+
+ <line color="gtk:fg[ACTIVE]" width="1"
+ x1="ButtonIPad"
+ y1="height - 1 - ButtonIPad - 1"
+ x2="width - 1 - ButtonIPad"
+ y2="ButtonIPad - 1"/>
+ <line color="gtk:fg[ACTIVE]" width="1"
+ x1="ButtonIPad + 1"
+ y1="height - 1 - ButtonIPad - 1"
+ x2="width - 1 - ButtonIPad"
+ y2="ButtonIPad"/>
+ <line color="gtk:fg[ACTIVE]" width="1"
+ x1="ButtonIPad"
+ y1="height - 1 - ButtonIPad - 1 - 1"
+ x2="width - 1 - ButtonIPad - 1"
+ y2="ButtonIPad - 1"/>
</draw_ops>
<!-- End Buttons Icons -->
<!-- Outer Bevel -->
<draw_ops name="outer_bevel">
- <rectangle color="gtk:dark[INSENSITIVE]"
+ <rectangle color="gtk:dark[NORMAL]"
x="0" y="0" width="width - 1" height="height - 1"/>
- <rectangle color="gtk:bg[INSENSITIVE]" filled="true"
+ <rectangle color="gtk:bg[NORMAL]" filled="true"
x="1" y="1" width="width - 2" height="height - 2"/>
</draw_ops>
+<draw_ops name="gradient_background">
+ <gradient type="vertical" x="0" y="0" width="width" height="top_height">
+ <color value="gtk:light[SELECTED]"/>
+ <color value="gtk:dark[SELECTED]"/>
+ </gradient>
+</draw_ops>
+
<draw_ops name="outer_bevel_focused">
<gtk_box state="selected" shadow="out" x="2" y="2" width="width - 2"
height="height - 2"/>
- <gradient type="diagonal" x="3" y="3" width="width - 6" height="title_height + 6">
- <color value="blend/#ffffff/gtk:bg[SELECTED]/0.5"/>
- <color value="gtk:bg[SELECTED]"/>
- </gradient>
+ <rectangle color="gtk:bg[NORMAL]" filled="true"
+ x="left_width" y="top_height"
+ width="width - left_width - right_width - 1"
+ height="height - top_height - bottom_height - 1"/>
<rectangle color="gtk:fg[NORMAL]"
x="0" y="0" width="width - 1" height="height - 1"/>
-</draw_ops>
-
-<draw_ops name="gradient_background">
- <gradient type="diagonal" x="0" y="0" width="width" height="title_height + 8">
- <color value="blend/#ffffff/gtk:bg[SELECTED]/0.5"/>
- <color value="gtk:bg[SELECTED]"/>
- </gradient>
+ <include name="gradient_background"
+ x="3" y="3" width="width - 7" height="height - 7"/>
</draw_ops>
<draw_ops name="blank">
<!-- nothing -->
</draw_ops>
-<draw_ops name="outline">
- <rectangle color="gtk:fg[INSENSITIVE]"
- x="left_width-1" y="top_height-1"
- width="width-left_width-right_width+1"
- height="height-top_height-bottom_height+1"/>
-</draw_ops>
-
<draw_ops name="outline_focused">
<rectangle color="gtk:fg[NORMAL]"
- x="left_width-1" y="top_height-1"
- width="width-left_width-right_width+1"
- height="height-top_height-bottom_height+1"/>
+ x="left_width - 1" y="top_height - 1"
+ width="width - left_width - right_width + 1"
+ height="height - top_height - bottom_height + 1"/>
</draw_ops>
<draw_ops name="background">
<include name="outer_bevel"/>
- <include name="outline"/>
</draw_ops>
<draw_ops name="background_focused">
@@ -398,58 +737,97 @@
</draw_ops>
<draw_ops name="title_background">
- <line color="#ffffff" width="100"
- x1="width - title_width - IconTitleSpacing + (height / 2) + height"
- y1="height / 2"
- x2="width"
- y2="height / 2"/>
- <line color="#ffffff" width="48"
- x1="width - title_width + (height / 2) + (height * 2)"
- y1="0 - height"
- x2="width - title_width + (height / 2) - height"
- y2="height * 2"/>
+ <line color="#000000" width="50"
+ x1="width - title_width - IconTitleSpacing + 25 - 1 + 3"
+ y1="0 - 25"
+ x2="width - title_width - IconTitleSpacing - height - 25 - 1 + 3"
+ y2="height + 25"/>
+ <line color="#ffffff" width="50"
+ x1="width - title_width - IconTitleSpacing + 25 + 3"
+ y1="0 - 25"
+ x2="width - title_width - IconTitleSpacing - height - 25 + 3"
+ y2="height + 25"/>
+ <line color="#000000" width="1"
+ x1="width - 1"
+ y1="0"
+ x2="width - 1"
+ y2="height"/>
+ <rectangle color="#ffffff" filled="true"
+ x="width - title_width - mini_icon_width - IconTitleSpacing * 3"
+ y="0"
+ width="title_width + mini_icon_width + IconTitleSpacing * 3 - 1"
+ height="height"/>
</draw_ops>
<draw_ops name="title_text_focused_with_icon">
<title color="#000000"
- x="width - title_width - IconTitleSpacing + 3"
- y="((height - title_height) / 2) `max` 0"/>
+ x="width - title_width - IconTitleSpacing"
+ y="(height / 2) - (title_height / 2) - 1"/>
<icon
- x="width - title_width - mini_icon_width - (IconTitleSpacing * 1.5) + 3"
- y="(height - mini_icon_height) / 2 + 1"
+ x="width - title_width - mini_icon_width - (IconTitleSpacing * 2)"
+ y="(height / 2) - (mini_icon_height / 2)"
width="mini_icon_width"
height="mini_icon_height"/>
</draw_ops>
<draw_ops name="title_text_focused_no_icon">
- <title color="#000000"
- x="width - title_width - IconTitleSpacing + 3"
- y="((height - title_height) / 2) `max` 0 + 1"/>
+ <title color="gtk:fg[INSENSITIVE]"
+ x="width - title_width - IconTitleSpacing"
+ y="(height / 2) - (title_height / 2)"/>
+ <icon
+ x="width - title_width - height - (IconTitleSpacing * 2)"
+ y="0"
+ width="height"
+ height="height"/>
</draw_ops>
<draw_ops name="title_text_with_icon">
- <title color="gtk:fg[INSENSITIVE]"
- x="width - title_width - IconTitleSpacing + 3"
- y="((height - title_height) / 2) `max` 0"/>
- <icon alpha="0.25"
- x="width - title_width - mini_icon_width - (IconTitleSpacing * 1.5) + 3"
- y="(height - mini_icon_height) / 2 + 1"
+ <title color="gtk:dark[NORMAL]"
+ x="width - title_width - IconTitleSpacing"
+ y="(height / 2) - (title_height / 2) - 2"/>
+ <icon alpha="0.33"
+ x="width - title_width - mini_icon_width - (IconTitleSpacing * 2)"
+ y="(height / 2) - (mini_icon_height / 2) - 2"
width="mini_icon_width"
height="mini_icon_height"/>
</draw_ops>
<draw_ops name="title_text_no_icon">
- <title color="gtk:fg[INSENSITIVE]"
- x="width - title_width - IconTitleSpacing + 3"
- y="((height - title_height) / 2) `max` 0"/>
+ <title color="gtk:dark[NORMAL]"
+ x="width - title_width - IconTitleSpacing"
+ y="(height / 2) - (title_height / 2)"/>
+ <icon alpha="0.33"
+ x="width - title_width - height - (IconTitleSpacing * 2)"
+ y="0"
+ width="height"
+ height="height"/>
</draw_ops>
<draw_ops name="title_normal">
- <include name="title_text_with_icon"/>
+ <include name="title_text_with_icon" x="0" y="3" width="width" height="height - 3"/>
</draw_ops>
<draw_ops name="title_focused">
<include name="title_background"/>
+ <line color="#000000" width="1"
+ x1="width - title_width - mini_icon_width - IconTitleSpacing * 3"
+ y1="0"
+ x2="width"
+ y2="0"/>
+ <line color="#000000" width="1"
+ x1="width - title_width - mini_icon_width - IconTitleSpacing * 3 - 18"
+ y1="height - 1"
+ x2="width"
+ y2="height - 1"/>
+ <include name="title_text_focused_with_icon" x="0" y="2" width="width" height="height - 3"/>
+</draw_ops>
+
+<draw_ops name="title_maximized">
+ <include name="title_text_with_icon"/>
+</draw_ops>
+
+<draw_ops name="title_maximized_focused">
+ <include name="title_background"/>
<include name="title_text_focused_with_icon"/>
</draw_ops>
@@ -458,7 +836,16 @@
</draw_ops>
<draw_ops name="title_utility_focused">
- <include name="title_background"/>
+ <include name="title_background"
+ x="mini_icon_width + IconTitleSpacing"
+ y="0"
+ width="width - mini_icon_width - IconTitleSpacing"
+ height="height"/>
+ <line color="#000000" width="1"
+ x1="width - title_width - mini_icon_width - IconTitleSpacing * 3"
+ y1="0"
+ x2="width"
+ y2="0"/>
<include name="title_text_focused_no_icon"/>
</draw_ops>
@@ -467,16 +854,18 @@
<piece position="title" draw_ops="title_normal"/>
- <!-- we don't specify for normal or prelight, so nothing is used for
- those -->
- <button function="menu" state="normal" draw_ops="menu_button"/>
- <button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
+ <button function="menu" state="normal"
+ draw_ops="menu_button"/>
+ <button function="menu" state="pressed"
+ draw_ops="menu_button_pressed"/>
- <button function="minimize" state="normal" draw_ops="minimize_button"/>
+ <button function="minimize" state="normal"
+ draw_ops="minimize_button"/>
<button function="minimize" state="pressed"
draw_ops="minimize_button_pressed"/>
- <button function="maximize" state="normal" draw_ops="maximize_button"/>
+ <button function="maximize" state="normal"
+ draw_ops="maximize_button"/>
<button function="maximize" state="pressed"
draw_ops="maximize_button_pressed"/>
@@ -488,32 +877,33 @@
<piece position="entire_background" draw_ops="background_focused"/>
<piece position="title" draw_ops="title_focused"/>
- <!-- we don't specify for prelight, so normal is used -->
- <button function="left_left_background" state="normal"
- draw_ops="button_normal_bg"/>
- <button function="left_middle_background" state="normal"
- draw_ops="button_normal_bg"/>
- <button function="left_right_background" state="normal"
- draw_ops="button_normal_bg"/>
-
- <button function="right_left_background" state="normal"
- draw_ops="button_normal_bg"/>
- <button function="right_middle_background" state="normal"
- draw_ops="button_normal_bg"/>
- <button function="right_right_background" state="normal"
- draw_ops="button_normal_bg"/>
-
- <button function="close" state="normal" draw_ops="close_button_focused"/>
- <button function="menu" state="normal" draw_ops="menu_button_focused"/>
+ <button function="close" state="normal"
+ draw_ops="close_button_focused"/>
+ <button function="close" state="prelight"
+ draw_ops="close_button_prelight"/>
+
+ <button function="menu" state="normal"
+ draw_ops="menu_button_focused"/>
+ <button function="menu" state="prelight"
+ draw_ops="menu_button_prelight"/>
+
<button function="maximize" state="normal"
draw_ops="maximize_button_focused"/>
+ <button function="maximize" state="prelight"
+ draw_ops="maximize_button_prelight"/>
+
<button function="minimize" state="normal"
draw_ops="minimize_button_focused"/>
+ <button function="minimize" state="prelight"
+ draw_ops="minimize_button_prelight"/>
</frame_style>
<frame_style name="maximized_unfocused" geometry="normal_small_borders"
parent="normal_unfocused">
<piece position="entire_background" draw_ops="blank"/>
+
+ <piece position="title" draw_ops="title_maximized"/>
+
<button function="maximize" state="normal"
draw_ops="restore_button"/>
<button function="maximize" state="pressed"
@@ -523,10 +913,14 @@
<frame_style name="maximized_focused" geometry="normal_small_borders"
parent="normal_focused">
<piece position="entire_background" draw_ops="gradient_background"/>
+ <piece position="title" draw_ops="title_maximized_focused"/>
+
<button function="maximize" state="normal"
draw_ops="restore_button_focused"/>
<button function="maximize" state="pressed"
draw_ops="restore_button_pressed"/>
+ <button function="maximize" state="prelight"
+ draw_ops="restore_button_prelight"/>
</frame_style>
<frame_style name="utility_unfocused" geometry="utility"
@@ -580,7 +974,7 @@
<window type="normal" style_set="normal"/>
<window type="dialog" style_set="normal"/>
<window type="modal_dialog" style_set="normal"/>
-<window type="menu" style_set="normal"/>
+<window type="menu" style_set="utility"/>
<window type="utility" style_set="utility"/>
<window type="border" style_set="border"/>