[gnome-themes-standard] mutter: sync with headerbars
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] mutter: sync with headerbars
- Date: Tue, 20 Aug 2013 19:18:46 +0000 (UTC)
commit 5866f09ce9ea60f6fa729f0793417e8071e1f118
Author: Jakub Steiner <jimmac gmail com>
Date: Mon Aug 19 18:27:18 2013 +0200
mutter: sync with headerbars
- use regular raised button style for wm.
https://bugzilla.gnome.org/show_bug.cgi?id=706321
themes/Adwaita/metacity-1/metacity-theme-3.xml | 623 ++++++++----------------
1 files changed, 202 insertions(+), 421 deletions(-)
---
diff --git a/themes/Adwaita/metacity-1/metacity-theme-3.xml b/themes/Adwaita/metacity-1/metacity-theme-3.xml
index 899c09a..8fc13d3 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-3.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-3.xml
@@ -19,13 +19,15 @@
<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
<!-- color of the button icons -->
-<constant name="C_icons_focused" value="gtk:text[SELECTED]" />
-<constant name="C_icons_focused_pressed" value="#ffffff" />
+<constant name="C_icons_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
+<constant name="C_icons_pressed" value="gtk:text[SELECTED]" />
<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
<constant name="C_icons_unfocused_prelight" value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.3" />
<constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
-<constant name="D_icons_unfocused_offset" value="2" /> <!-- offset of the unfocused icons -->
-<constant name="D_icons_shrink" value="1" /> <!-- increasing this value makes the icons in buttons smaller
-->
+<constant name="C_icons_shadow" value="gtk:custom(wm_title_shadow,gtk:base[NORMAL])" />
+<constant name="C_separator" value="blend/#000000/gtk:bg[NORMAL]/0.9" />
+<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
+<constant name="D_icons_shrink" value="3" /> <!-- increasing this value makes the icons in buttons smaller
-->
<constant name="D_icons_grow" value="0" /> <!-- increasing this value makes the icons in buttons bigger -->
<!-- geometries -->
@@ -33,11 +35,11 @@
<distance name="left_width" value="1" />
<distance name="right_width" value="1" />
<distance name="bottom_height" value="1" />
- <distance name="left_titlebar_edge" value="0"/>
- <distance name="right_titlebar_edge" value="0"/>
- <distance name="title_vertical_pad" value="9"/>
+ <distance name="left_titlebar_edge" value="1"/>
+ <distance name="right_titlebar_edge" value="1"/>
+ <distance name="title_vertical_pad" value="16"/>
<border name="title_border" left="10" right="10" top="0" bottom="2"/>
- <border name="button_border" left="0" right="0" top="0" bottom="2"/>
+ <border name="button_border" left="0" right="0" top="1" bottom="0"/>
<aspect_ratio name="button" value="1"/>
</frame_geometry>
@@ -49,14 +51,14 @@
<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false"
rounded_top_right="false">
<distance name="left_width" value="0" />
<distance name="right_width" value="0" />
- <distance name="left_titlebar_edge" value="0"/>
- <distance name="right_titlebar_edge" value="0"/>
- <distance name="title_vertical_pad" value="8"/> <!--
+ <distance name="left_titlebar_edge" value="1"/>
+ <distance name="right_titlebar_edge" value="1"/>
+ <distance name="title_vertical_pad" value="15"/> <!--
This needs to be 1 less then the
title_vertical_pad on normal state
or you'll have bigger buttons
-->
<border name="title_border" left="10" right="10" top="1" bottom="2"/>
- <border name="button_border" left="0" right="0" top="0" bottom="2"/>
+ <border name="button_border" left="0" right="0" top="0" bottom="0"/>
<distance name="bottom_height" value="0" />
</frame_geometry>
@@ -246,19 +248,6 @@
</draw_ops>
-<!-- <draw_ops name="border_right_focused">
- <line
- x1="width-1" y1="0"
- x2="width-1" y2="height"
- color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
- <line
- x1="width-1" y1="0"
- x2="width-1" y2="height"
- color="C_border_unfocused" />
-</draw_ops> -->
<draw_ops name="border_left_focused">
<line
@@ -276,72 +265,128 @@
<!-- button icons-->
-<constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<draw_ops name="close_glyph_focused">
+<draw_ops name="close_shadow_focused">
<line
x1="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
- color="C_icons_focused" />
+ color="C_icons_shadow" />
<line
x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
- color="C_icons_focused" />
+ color="C_icons_shadow" />
<line
x1="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
- color="C_icons_focused" />
+ color="C_icons_shadow" />
<line
x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
x2="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
- color="C_icons_focused" />
+ color="C_icons_shadow" />
<line
x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
x2="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
- color="C_icons_focused" />
+ color="C_icons_shadow" />
<line
x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
- color="C_icons_focused" />
+ color="C_icons_shadow" />
</draw_ops>
-<draw_ops name="close_shadow_focused">
+<draw_ops name="close_glyph_pressed">
<line
x1="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
- color="C_icons_shadow" />
+ color="C_icons_pressed" />
<line
x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
- color="C_icons_shadow" />
+ color="C_icons_pressed" />
<line
x1="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
- color="C_icons_shadow" />
+ color="C_icons_pressed" />
<line
x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
x2="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
- color="C_icons_shadow" />
+ color="C_icons_pressed" />
<line
x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
x2="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
- color="C_icons_shadow" />
+ color="C_icons_pressed" />
<line
x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
- color="C_icons_shadow" />
+ color="C_icons_pressed" />
+</draw_ops>
+
+<draw_ops name="close_glyph_prelight">
+ <line
+ x1="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
+ color="gtk:text[NORMAL]" />
+ <line
+ x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
+ color="gtk:text[NORMAL]" />
+ <line
+ x1="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+ x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
+ color="gtk:text[NORMAL]" />
+ <line
+ x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ x2="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
+ color="gtk:text[NORMAL]" />
+ <line
+ x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ x2="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
+ color="gtk:text[NORMAL]" />
+ <line
+ x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+ x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
+ color="gtk:text[NORMAL]" />
+</draw_ops>
+
+<draw_ops name="close_glyph_focused">
+ <line
+ x1="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ x2="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+ x2="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ x2="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-2-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ x2="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-1-D_icons_shrink+D_icons_grow"
y1="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+ x2="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y2="height-(height-height%3)/3-1-D_icons_shrink+D_icons_grow"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="close_focused">
<include name="close_shadow_focused" y="1" />
- <!-- I'm not happy with the current aa I'll draw it twice to make it darker -->
- <include name="close_shadow_focused" y="1" />
<include name="close_glyph_focused" />
+
</draw_ops>
<draw_ops name="close_focused_pressed">
- <include name="close_shadow_focused" />
- <include name="close_glyph_focused" />
+ <include name="close_glyph_pressed" y="1" />
+</draw_ops>
+
+<draw_ops name="close_focused_prelight">
+ <include name="close_shadow_focused" y="1" />
+ <include name="close_glyph_prelight" />
</draw_ops>
<draw_ops name="close_glyph_unfocused">
@@ -451,6 +496,28 @@
color="C_icons_focused" />
</draw_ops>
+<draw_ops name="maximize_glyph_pressed">
+ <rectangle
+ x="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow"
height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow"
+ color="C_icons_pressed" />
+ <rectangle
+ x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+ width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow"
height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow"
+ color="C_icons_pressed" />
+</draw_ops>
+
+<draw_ops name="maximize_glyph_prelight">
+ <rectangle
+ x="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
+ width="width-2*(width-width%3)/3-1-2*D_icons_shrink+2*D_icons_grow"
height="height-2*(height-height%3)/3-1-2*D_icons_shrink+2*D_icons_grow"
+ color="gtk:text[NORMAL]" />
+ <rectangle
+ x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y="(height-height%3)/3+1+D_icons_shrink-D_icons_grow"
+ width="width-2*(width-width%3)/3-3-2*D_icons_shrink+2*D_icons_grow"
height="height-2*(height-height%3)/3-3-2*D_icons_shrink+2*D_icons_grow"
+ color="gtk:text[NORMAL]" />
+</draw_ops>
+
<draw_ops name="maximize_shadow_focused">
<rectangle
x="(width-width%3)/3+D_icons_shrink-D_icons_grow"
y="(height-height%3)/3+D_icons_shrink-D_icons_grow"
@@ -468,7 +535,12 @@
</draw_ops>
<draw_ops name="maximize_focused_pressed">
- <include name="maximize_glyph_focused" />
+ <include name="maximize_glyph_pressed" y="1" />
+</draw_ops>
+
+<draw_ops name="maximize_focused_prelight">
+ <include name="maximize_shadow_focused" y="1" />
+ <include name="maximize_glyph_prelight" />
</draw_ops>
<draw_ops name="maximize_glyph_unfocused">
@@ -523,6 +595,20 @@
color="C_icons_focused" />
</draw_ops>
+<draw_ops name="minimize_glyph_pressed">
+ <rectangle
+ x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
+ width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
+ color="C_icons_pressed" />
+</draw_ops>
+
+<draw_ops name="minimize_glyph_prelight">
+ <rectangle
+ x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
+ width="width-2*(width-width%3)/3-2-2*D_icons_shrink+2*D_icons_grow" height="2" filled="true"
+ color="gtk:text[NORMAL]" />
+</draw_ops>
+
<draw_ops name="minimize_shadow_focused">
<rectangle
x="(width-width%3)/3+1+D_icons_shrink-D_icons_grow"
y="height-(height-height%3)/3-2-D_icons_shrink+D_icons_grow"
@@ -536,7 +622,12 @@
</draw_ops>
<draw_ops name="minimize_focused_pressed">
- <include name="minimize_glyph_focused" />
+ <include name="minimize_glyph_pressed" y="1" />
+</draw_ops>
+
+<draw_ops name="minimize_focused_prelight">
+ <include name="minimize_shadow_focused" y="1" />
+ <include name="minimize_glyph_prelight" />
</draw_ops>
<draw_ops name="minimize_glyph_unfocused">
@@ -782,268 +873,48 @@
<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
<constant name="C_button_hilight" value="gtk:custom(wm_highlight,blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6)"
/>
-<draw_ops name="button_fill"> <!-- button background gradient -->
- <gradient type="vertical" x="0" y="0" width="width" height="height-2">
- <color value="gtk:custom(wm_button_bg_a,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.15)" />
- <color value="gtk:custom(wm_button_bg_b,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.21)" />
- <color value="gtk:custom(wm_button_bg_c,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.27)" />
- <color value="gtk:custom(wm_button_bg_d,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.12)" />
- </gradient>
+<draw_ops name="button_border">
+ <line x1="7" y1="4" x2="width-8" y2="4" color="C_button_border" />
+ <arc color="C_button_border" x="width-9" y="4" width="4" height="4" start_angle="0" extent_angle="90"/>
+ <line x1="width-5" y1="7" x2="width-5" y2="height-8" color="C_button_border" />
+ <arc color="C_button_border" x="width-9" y="height-10" width="4" height="4" start_angle="90"
extent_angle="90"/>
+ <line x1="width-7" y1="height-5" x2="7" y2="height-5" color="C_button_border" />
+ <arc color="C_button_border" x="4" y="height-9" width="4" height="4" start_angle="180" extent_angle="90"/>
+ <line x1="4" y1="7" x2="4" y2="height-8" color="C_button_border" />
+ <arc color="C_button_border" x="4" y="4" width="4" height="4" start_angle="270" extent_angle="90"/>
+ <line x1="width-7" y1="height-4" x2="7" y2="height-4" color="C_title_focused_hilight" />
</draw_ops>
-<draw_ops name="button_bottom">
- <line x1="0" y1="height-2" x2="width-1" y2="height-2" color="C_button_border" />
- <line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_button_hilight" />
-</draw_ops>
-<draw_ops name="button_bevel">
- <gradient type="vertical" x="0" y="0" width="1" height="height-2">
- <color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.1"/>
- <color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
- </gradient>
- <gradient type="vertical" x="width-1" y="0" width="1" height="height-2">
- <color value="C_border_focused"/>
- <color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
- </gradient>
+<draw_ops name="button_fill"> <!-- button background gradient -->
+
</draw_ops>
<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status -->
- <gradient type="vertical" x="0" y="0" width="width" height="height-2">
- <color value="gtk:custom(wm_button_bg_hover_a,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03)" />
- <color value="gtk:custom(wm_button_bg_hover_b,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1)" />
- <color value="gtk:custom(wm_button_bg_hover_c,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.2)" />
- <color value="gtk:custom(wm_button_bg_hover_d,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.04)" />
+ <gradient type="vertical" x="5" y="5" width="width-10" height="height-10">
+ <color value="gtk:custom(button_hover_gradient_color_a,gtk:fg[NORMAL])" />
+ <color value="gtk:custom(button_hover_gradient_color_b,gtk:fg[NORMAL])" />
</gradient>
+ <include name="button_border" />
</draw_ops>
<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status -->
- <gradient type="vertical" x="0" y="0" width="width" height="height-2">
- <color value="gtk:custom(wm_button_bg_active_a,blend/#000000/gtk:bg[NORMAL]/0.7)" />
- <color value="gtk:custom(wm_button_bg_active_b,blend/#000000/gtk:bg[NORMAL]/0.75)" />
- <color value="gtk:custom(wm_button_bg_active_c,blend/#000000/gtk:bg[NORMAL]/0.8)" />
+ <gradient type="vertical" x="5" y="5" width="width-10" height="height-10">
+ <color value="gtk:custom(borders,gtk:fg[NORMAL])" />
+ <color value="blend/gtk:custom(theme_bg_color,gtk:fg[NORMAL])/#000000/.05" />
</gradient>
+ <include name="button_border" />
</draw_ops>
<draw_ops name="button">
- <include name="button_fill" />
- <include name="button_bevel" />
- <include name="button_bottom" />
</draw_ops>
<draw_ops name="button_prelight">
<include name="button_fill_prelight" />
- <include name="button_bevel" />
- <include name="button_bottom" />
</draw_ops>
<draw_ops name="button_pressed">
<include name="button_fill_pressed" />
- <include name="button_bottom" />
-</draw_ops>
-
-<!-- things get messy here -->
-
-<draw_ops name="button_inner_right_slice1">
- <clip x="0" y="0" width="width" height="height-5" />
- <include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice2">
- <clip x="1" y="height-5" width="width-1" height="2" />
- <include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice3">
- <clip x="2" y="height-3" width="width-2" height="1" />
- <include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice4">
- <clip x="4" y="height-2" width="width-4" height="2" />
- <include name="button" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_fill">
- <include name="button_inner_right_slice1" />
- <include name="button_inner_right_slice2" />
- <include name="button_inner_right_slice3" />
- <include name="button_inner_right_slice4" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_slice1_prelight">
- <clip x="0" y="0" width="width" height="height-5" />
- <include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice2_prelight">
- <clip x="1" y="height-5" width="width-1" height="2" />
- <include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice3_prelight">
- <clip x="2" y="height-3" width="width-2" height="1" />
- <include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice4_prelight">
- <clip x="4" y="height-2" width="width-4" height="2" />
- <include name="button_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_fill_prelight">
- <include name="button_inner_right_slice1_prelight" />
- <include name="button_inner_right_slice2_prelight" />
- <include name="button_inner_right_slice3_prelight" />
- <include name="button_inner_right_slice4_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_slice1_pressed">
- <clip x="0" y="0" width="width" height="height-5" />
- <include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice2_pressed">
- <clip x="1" y="height-5" width="width-1" height="2" />
- <include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice3_pressed">
- <clip x="2" y="height-3" width="width-2" height="1" />
- <include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_right_slice4_pressed">
- <clip x="4" y="height-2" width="width-4" height="2" />
- <include name="button_pressed" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_fill_pressed">
- <include name="button_inner_right_slice1_pressed" />
- <include name="button_inner_right_slice2_pressed" />
- <include name="button_inner_right_slice3_pressed" />
- <include name="button_inner_right_slice4_pressed" />
-</draw_ops>
-
-
-<draw_ops name="button_inner_right_border">
- <gradient type="vertical" x="0" y="0" width="1" height="height-5">
- <color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
- <color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
- </gradient>
- <arc color="C_button_hilight" x="1" y="height-10" width="9" height="9" start_angle="180"
extent_angle="90" />
- <gradient type="vertical" x="1" y="0" width="1" height="height-5">
- <color value="C_border_focused" />
- <color value="C_button_border" />
- </gradient>
- <arc color="C_button_border" x="1" y="height-11" width="9" height="9" start_angle="180"
extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="button_inner_right">
- <include name="button_inner_right_fill" />
- <include name="button_inner_right_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_prelight">
- <include name="button_inner_right_fill_prelight" />
- <include name="button_inner_right_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_right_pressed">
- <include name="button_inner_right_fill_pressed" />
- <include name="button_inner_right_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_slice1">
- <clip x="0" y="0" width="width-1" height="height-5" />
- <include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice2">
- <clip x="0" y="height-5" width="width-2" height="2" />
- <include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice3">
- <clip x="0" y="height-3" width="width-3" height="1" />
- <include name="button" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice4">
- <clip x="0" y="height-2" width="width-5" height="2" />
- <include name="button" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_fill">
- <include name="button_inner_left_slice1" />
- <include name="button_inner_left_slice2" />
- <include name="button_inner_left_slice3" />
- <include name="button_inner_left_slice4" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_slice1_prelight">
- <clip x="0" y="0" width="width-1" height="height-5" />
- <include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice2_prelight">
- <clip x="0" y="height-5" width="width-2" height="2" />
- <include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice3_prelight">
- <clip x="0" y="height-3" width="width-3" height="1" />
- <include name="button_prelight" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice4_prelight">
- <clip x="0" y="height-2" width="width-5" height="2" />
- <include name="button_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_fill_prelight">
- <include name="button_inner_left_slice1_prelight" />
- <include name="button_inner_left_slice2_prelight" />
- <include name="button_inner_left_slice3_prelight" />
- <include name="button_inner_left_slice4_prelight" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_slice1_pressed">
- <clip x="0" y="0" width="width-1" height="height-5" />
- <include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice2_pressed">
- <clip x="0" y="height-5" width="width-2" height="2" />
- <include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice3_pressed">
- <clip x="0" y="height-3" width="width-3" height="1" />
- <include name="button_pressed" />
-</draw_ops>
-<draw_ops name="button_inner_left_slice4_pressed">
- <clip x="0" y="height-2" width="width-5" height="2" />
- <include name="button_pressed" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_fill_pressed">
- <include name="button_inner_left_slice1_pressed" />
- <include name="button_inner_left_slice2_pressed" />
- <include name="button_inner_left_slice3_pressed" />
- <include name="button_inner_left_slice4_pressed" />
-</draw_ops>
-
-
-<draw_ops name="button_inner_left_border">
- <gradient type="vertical" x="width-1" y="0" width="1" height="height-6">
- <color value="C_titlebar_focused_hilight" />
- <color value="C_button_hilight" />
- </gradient>
- <arc color="C_button_hilight" x="width-11" y="height-11" width="10" height="10" start_angle="90"
extent_angle="90" />
- <gradient type="vertical" x="width-2" y="0" width="1" height="height-5">
- <color value="C_border_focused" />
- <color value="C_button_border" />
- </gradient>
- <arc color="C_button_border" x="width-11" y="height-11" width="9" height="9" start_angle="90"
extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="button_inner_left">
- <include name="button_inner_left_fill" />
- <include name="button_inner_left_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_prelight">
- <include name="button_inner_left_fill_prelight" />
- <include name="button_inner_left_border" />
-</draw_ops>
-
-<draw_ops name="button_inner_left_pressed">
- <include name="button_inner_left_fill_pressed" />
- <include name="button_inner_left_border" />
</draw_ops>
<!-- frame styles -->
@@ -1055,37 +926,26 @@
<piece position="overlay" draw_ops="rounded_border_focused" />
<button function="close" state="normal" draw_ops="close_focused" />
<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+ <button function="close" state="prelight" draw_ops="close_focused_prelight" />
<button function="maximize" state="normal" draw_ops="maximize_focused" />
<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+ <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
<button function="minimize" state="normal" draw_ops="minimize_focused" />
<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+ <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
<button function="menu" state="normal" draw_ops="menu_focused" />
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
<button function="shade" state="normal" draw_ops="shade_focused" />
<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
<button function="unshade" state="normal" draw_ops="shade_focused" />
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
+
<button function="left_middle_background" state="normal" draw_ops="button"/>
- <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
- <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
- <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
+ <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="normal" draw_ops="button"/>
- <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
- <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
- <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
- <button version=">= 3.3" function="left_single_background" state="normal"
draw_ops="button_inner_left"/>
- <button version=">= 3.3" function="left_single_background" state="prelight"
draw_ops="button_inner_left_prelight"/>
- <button version=">= 3.3" function="left_single_background" state="pressed"
draw_ops="button_inner_left_pressed"/>
- <button version=">= 3.3" function="right_single_background" state="normal"
draw_ops="button_inner_right"/>
- <button version=">= 3.3" function="right_single_background" state="prelight"
draw_ops="button_inner_right_prelight"/>
- <button version=">= 3.3" function="right_single_background" state="pressed"
draw_ops="button_inner_right_pressed"/>
+ <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="above" state="normal"><draw_ops></draw_ops></button>
<button function="above" state="pressed"><draw_ops></draw_ops></button>
@@ -1136,10 +996,13 @@
<piece position="title" draw_ops="title_focused" />
<button function="close" state="normal" draw_ops="close_focused" />
<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+ <button function="close" state="prelight" draw_ops="close_focused_prelight" />
<button function="maximize" state="normal" draw_ops="maximize_focused" />
<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+ <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
<button function="minimize" state="normal" draw_ops="minimize_focused" />
<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+ <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
<button function="menu" state="normal" draw_ops="menu_focused" />
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
<button function="shade" state="normal" draw_ops="shade_focused" />
@@ -1148,25 +1011,11 @@
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
<button function="left_middle_background" state="normal" draw_ops="button"/>
- <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
- <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
- <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
+ <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="normal" draw_ops="button"/>
- <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
- <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
- <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
- <button version=">= 3.3" function="left_single_background" state="normal"
draw_ops="button_inner_left"/>
- <button version=">= 3.3" function="left_single_background" state="prelight"
draw_ops="button_inner_left_prelight"/>
- <button version=">= 3.3" function="left_single_background" state="pressed"
draw_ops="button_inner_left_pressed"/>
- <button version=">= 3.3" function="right_single_background" state="normal"
draw_ops="button_inner_right"/>
- <button version=">= 3.3" function="right_single_background" state="prelight"
draw_ops="button_inner_right_prelight"/>
- <button version=">= 3.3" function="right_single_background" state="pressed"
draw_ops="button_inner_right_pressed"/>
+ <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="above" state="normal"><draw_ops></draw_ops></button>
<button function="above" state="pressed"><draw_ops></draw_ops></button>
@@ -1217,10 +1066,13 @@
<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1"
color="C_border_focused" /></draw_ops></piece>
<button function="close" state="normal" draw_ops="close_focused" />
<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+ <button function="close" state="prelight" draw_ops="close_focused_prelight" />
<button function="maximize" state="normal" draw_ops="maximize_focused" />
<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+ <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
<button function="minimize" state="normal" draw_ops="minimize_focused" />
<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+ <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
<button function="menu" state="normal" draw_ops="menu_focused" />
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
<button function="shade" state="normal" draw_ops="shade_focused" />
@@ -1229,25 +1081,11 @@
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
<button function="left_middle_background" state="normal" draw_ops="button"/>
- <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
- <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
- <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
+ <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="normal" draw_ops="button"/>
- <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
- <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
- <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
- <button version=">= 3.3" function="left_single_background" state="normal"
draw_ops="button_inner_left"/>
- <button version=">= 3.3" function="left_single_background" state="prelight"
draw_ops="button_inner_left_prelight"/>
- <button version=">= 3.3" function="left_single_background" state="pressed"
draw_ops="button_inner_left_pressed"/>
- <button version=">= 3.3" function="right_single_background" state="normal"
draw_ops="button_inner_right"/>
- <button version=">= 3.3" function="right_single_background" state="prelight"
draw_ops="button_inner_right_prelight"/>
- <button version=">= 3.3" function="right_single_background" state="pressed"
draw_ops="button_inner_right_pressed"/>
+ <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="above" state="normal"><draw_ops></draw_ops></button>
<button function="above" state="pressed"><draw_ops></draw_ops></button>
@@ -1299,10 +1137,13 @@
<piece position="overlay" draw_ops="rounded_border_focused" />
<button function="close" state="normal" draw_ops="close_focused" />
<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+ <button function="close" state="prelight" draw_ops="close_focused_prelight" />
<button function="maximize" state="normal" draw_ops="maximize_focused" />
<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+ <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
<button function="minimize" state="normal" draw_ops="minimize_focused" />
<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+ <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
<button function="menu" state="normal" draw_ops="menu_focused" />
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
<button function="shade" state="normal" draw_ops="shade_focused" />
@@ -1311,25 +1152,11 @@
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
<button function="left_middle_background" state="normal" draw_ops="button"/>
- <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
- <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
- <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
+ <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="normal" draw_ops="button"/>
- <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
- <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
- <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
- <button version=">= 3.3" function="left_single_background" state="normal"
draw_ops="button_inner_left"/>
- <button version=">= 3.3" function="left_single_background" state="prelight"
draw_ops="button_inner_left_prelight"/>
- <button version=">= 3.3" function="left_single_background" state="pressed"
draw_ops="button_inner_left_pressed"/>
- <button version=">= 3.3" function="right_single_background" state="normal"
draw_ops="button_inner_right"/>
- <button version=">= 3.3" function="right_single_background" state="prelight"
draw_ops="button_inner_right_prelight"/>
- <button version=">= 3.3" function="right_single_background" state="pressed"
draw_ops="button_inner_right_pressed"/>
+ <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="above" state="normal"><draw_ops></draw_ops></button>
<button function="above" state="pressed"><draw_ops></draw_ops></button>
@@ -1379,10 +1206,13 @@
<piece position="overlay" draw_ops="border_focused" />
<button function="close" state="normal" draw_ops="close_focused" />
<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+ <button function="close" state="prelight" draw_ops="close_focused_prelight" />
<button function="maximize" state="normal" draw_ops="maximize_focused" />
<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+ <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
<button function="minimize" state="normal" draw_ops="minimize_focused" />
<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+ <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
<button function="menu" state="normal" draw_ops="menu_focused" />
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
<button function="shade" state="normal" draw_ops="shade_focused" />
@@ -1391,25 +1221,11 @@
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
<button function="left_middle_background" state="normal" draw_ops="button"/>
- <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
- <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
- <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
+ <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="normal" draw_ops="button"/>
- <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
- <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
- <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
- <button version=">= 3.3" function="left_single_background" state="normal"
draw_ops="button_inner_left"/>
- <button version=">= 3.3" function="left_single_background" state="prelight"
draw_ops="button_inner_left_prelight"/>
- <button version=">= 3.3" function="left_single_background" state="pressed"
draw_ops="button_inner_left_pressed"/>
- <button version=">= 3.3" function="right_single_background" state="normal"
draw_ops="button_inner_right"/>
- <button version=">= 3.3" function="right_single_background" state="prelight"
draw_ops="button_inner_right_prelight"/>
- <button version=">= 3.3" function="right_single_background" state="pressed"
draw_ops="button_inner_right_pressed"/>
+ <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="above" state="normal"><draw_ops></draw_ops></button>
<button function="above" state="pressed"><draw_ops></draw_ops></button>
@@ -1460,10 +1276,13 @@
<piece position="overlay" draw_ops="border_focused" />
<button function="close" state="normal" draw_ops="close_focused" />
<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+ <button function="close" state="prelight" draw_ops="close_focused_prelight" />
<button function="maximize" state="normal" draw_ops="maximize_focused" />
<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+ <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
<button function="minimize" state="normal" draw_ops="minimize_focused" />
<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+ <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
<button function="menu" state="normal" draw_ops="menu_focused" />
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
<button function="shade" state="normal" draw_ops="shade_focused" />
@@ -1471,28 +1290,12 @@
<button function="unshade" state="normal" draw_ops="shade_focused" />
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
- <button version="< 3.3" function="left_middle_background" state="normal"
draw_ops="button_inner_left"/>
- <button version="< 3.3" function="left_middle_background" state="prelight"
draw_ops="button_inner_left_prelight"/>
- <button version="< 3.3" function="left_middle_background" state="pressed"
draw_ops="button_inner_left_pressed"/>
-
- <button version="< 3.3" function="right_middle_background" state="normal"
draw_ops="button_inner_right"/>
- <button version="< 3.3" function="right_middle_background" state="prelight"
draw_ops="button_inner_right_prelight"/>
- <button version="< 3.3" function="right_middle_background" state="pressed"
draw_ops="button_inner_right_pressed"/>
-
- <button version=">= 3.3" function="left_middle_background" state="normal" draw_ops="button"/>
- <button version=">= 3.3" function="left_middle_background" state="prelight"
draw_ops="button_prelight"/>
- <button version=">= 3.3" function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
-
- <button version=">= 3.3"function="right_middle_background" state="normal" draw_ops="button"/>
- <button version=">= 3.3"function="right_middle_background" state="prelight"
draw_ops="button_prelight"/>
- <button version=">= 3.3"function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
-
- <button version=">= 3.3" function="left_single_background" state="normal"
draw_ops="button_inner_left"/>
- <button version=">= 3.3" function="left_single_background" state="prelight"
draw_ops="button_inner_left_prelight"/>
- <button version=">= 3.3" function="left_single_background" state="pressed"
draw_ops="button_inner_left_pressed"/>
- <button version=">= 3.3" function="right_single_background" state="normal"
draw_ops="button_inner_right"/>
- <button version=">= 3.3" function="right_single_background" state="prelight"
draw_ops="button_inner_right_prelight"/>
- <button version=">= 3.3" function="right_single_background" state="pressed"
draw_ops="button_inner_right_pressed"/>
+ <button function="left_middle_background" state="normal" draw_ops="button"/>
+ <button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
+ <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
+ <button function="right_middle_background" state="normal" draw_ops="button"/>
+ <button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
+ <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="above" state="normal"><draw_ops></draw_ops></button>
<button function="above" state="pressed"><draw_ops></draw_ops></button>
@@ -1671,10 +1474,13 @@
<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
<button function="close" state="normal" draw_ops="close_focused" />
<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+ <button function="close" state="prelight" draw_ops="close_focused_prelight" />
<button function="maximize" state="normal" draw_ops="maximize_focused" />
<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+ <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
<button function="minimize" state="normal" draw_ops="minimize_focused" />
<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+ <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
<button function="menu" state="normal" draw_ops="menu_focused" />
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
<button function="shade" state="normal" draw_ops="shade_focused" />
@@ -1683,25 +1489,11 @@
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
<button function="left_middle_background" state="normal" draw_ops="button"/>
- <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
- <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
- <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
+ <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="normal" draw_ops="button"/>
- <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
- <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
- <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
- <button version=">= 3.3" function="left_single_background" state="normal"
draw_ops="button_inner_left"/>
- <button version=">= 3.3" function="left_single_background" state="prelight"
draw_ops="button_inner_left_prelight"/>
- <button version=">= 3.3" function="left_single_background" state="pressed"
draw_ops="button_inner_left_pressed"/>
- <button version=">= 3.3" function="right_single_background" state="normal"
draw_ops="button_inner_right"/>
- <button version=">= 3.3" function="right_single_background" state="prelight"
draw_ops="button_inner_right_prelight"/>
- <button version=">= 3.3" function="right_single_background" state="pressed"
draw_ops="button_inner_right_pressed"/>
+ <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="above" state="normal"><draw_ops></draw_ops></button>
<button function="above" state="pressed"><draw_ops></draw_ops></button>
@@ -1753,10 +1545,13 @@
<piece position="overlay" draw_ops="border_left_focused" />
<button function="close" state="normal" draw_ops="close_focused" />
<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+ <button function="close" state="prelight" draw_ops="close_focused_prelight" />
<button function="maximize" state="normal" draw_ops="maximize_focused" />
<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+ <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
<button function="minimize" state="normal" draw_ops="minimize_focused" />
<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+ <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
<button function="menu" state="normal" draw_ops="menu_focused" />
<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
<button function="shade" state="normal" draw_ops="shade_focused" />
@@ -1765,25 +1560,11 @@
<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
<button function="left_middle_background" state="normal" draw_ops="button"/>
- <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
- <button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
- <button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
-
+ <button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="normal" draw_ops="button"/>
- <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
- <button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
- <button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
- <button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
-
- <button version=">= 3.3" function="left_single_background" state="normal"
draw_ops="button_inner_left"/>
- <button version=">= 3.3" function="left_single_background" state="prelight"
draw_ops="button_inner_left_prelight"/>
- <button version=">= 3.3" function="left_single_background" state="pressed"
draw_ops="button_inner_left_pressed"/>
- <button version=">= 3.3" function="right_single_background" state="normal"
draw_ops="button_inner_right"/>
- <button version=">= 3.3" function="right_single_background" state="prelight"
draw_ops="button_inner_right_prelight"/>
- <button version=">= 3.3" function="right_single_background" state="pressed"
draw_ops="button_inner_right_pressed"/>
+ <button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
<button function="above" state="normal"><draw_ops></draw_ops></button>
<button function="above" state="pressed"><draw_ops></draw_ops></button>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
