bringing this up to date

1 files changed, 133 insertions, 7 deletions

diff --git a/src/themes/Crux/metacity-theme-2.xml b/src/themes/Crux/metacity-theme-2.xml
index 4102ef23..f1e83806 100644
--- a/src/themes/Crux/metacity-theme-2.xml
+++ b/src/themes/Crux/metacity-theme-2.xml
@@ -13,7 +13,7 @@
 <constant name="CenterTitlePieceWidth" value="48"/> <!-- Width of center title piece -->
 <constant name="ButtonWidth" value="16"/> <!-- Button width -->
 
-<frame_geometry name="normal">
+<frame_geometry name="normal" hide_buttons="true">
   <distance name="left_width" value="5"/>
   <distance name="right_width" value="6"/>
   <distance name="bottom_height" value="6"/>
@@ -25,7 +25,7 @@
   <border name="button_border" left="0" right="0" top="3" bottom="3"/>
 </frame_geometry>
 
-<frame_geometry name="border" has_title="false">
+<frame_geometry name="border" has_title="false" hide_buttons="true">
   <distance name="left_width" value="5"/>
   <distance name="right_width" value="6"/>
   <distance name="bottom_height" value="6"/>
@@ -199,6 +199,27 @@
     </draw_ops>
   </button>
 
+  <button function="unshade" state="normal">
+    <draw_ops>
+      <include name="inactive_button"/>
+      <image filename="inactive-unshade-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unshade" state="pressed">
+    <draw_ops>
+      <include name="inactive_button_pressed"/>
+      <image filename="inactive-unshade-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unshade" state="prelight">
+    <draw_ops>
+      <include name="inactive_button_prelight"/>
+      <image filename="inactive-unshade-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
   <button function="shade" state="normal">
     <draw_ops>
       <include name="inactive_button"/>
@@ -220,6 +241,27 @@
     </draw_ops>
   </button>
 
+  <button function="unabove" state="normal">
+    <draw_ops>
+      <include name="inactive_button"/>
+      <image filename="inactive-unabove-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unabove" state="pressed">
+    <draw_ops>
+      <include name="inactive_button_pressed"/>
+      <image filename="inactive-unabove-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unabove" state="prelight">
+    <draw_ops>
+      <include name="inactive_button_prelight"/>
+      <image filename="inactive-unabove-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
   <button function="above" state="normal">
     <draw_ops>
       <include name="inactive_button"/>
@@ -262,6 +304,27 @@
     </draw_ops>
   </button>
 
+  <button function="unstick" state="normal">
+    <draw_ops>
+      <include name="inactive_button"/>
+      <image filename="inactive-unstick-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unstick" state="pressed">
+    <draw_ops>
+      <include name="inactive_button_pressed"/>
+      <image filename="inactive-unstick-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unstick" state="prelight">
+    <draw_ops>
+      <include name="inactive_button_prelight"/>
+      <image filename="inactive-unstick-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
   <button function="menu" state="normal">
     <draw_ops>
       <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
@@ -490,6 +553,27 @@
     </draw_ops>
   </button>
 
+  <button function="unshade" state="normal">
+    <draw_ops>
+      <include name="active_button"/>
+      <image filename="active-unshade-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unshade" state="pressed">
+    <draw_ops>
+      <include name="active_button_pressed"/>
+      <image filename="active-unshade-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unshade" state="prelight">
+    <draw_ops>
+      <include name="active_button_prelight"/>
+      <image filename="active-unshade-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
   <button function="above" state="normal">
     <draw_ops>
       <include name="active_button"/>
@@ -511,7 +595,28 @@
     </draw_ops>
   </button>
 
-  <button function="stick" state="normal">
+  <button function="unabove" state="normal">
+    <draw_ops>
+      <include name="active_button"/>
+      <image filename="active-unabove-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unabove" state="pressed">
+    <draw_ops>
+      <include name="active_button_pressed"/>
+      <image filename="active-unabove-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unabove" state="prelight">
+    <draw_ops>
+      <include name="active_button_prelight"/>
+      <image filename="active-unabove-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+ <button function="stick" state="normal">
     <draw_ops>
       <include name="active_button"/>
       <image filename="active-stick-button.png" x="2" y="2" width="width-4" height="height-4"/>
@@ -532,6 +637,27 @@
     </draw_ops>
   </button>
 
+ <button function="unstick" state="normal">
+    <draw_ops>
+      <include name="active_button"/>
+      <image filename="active-unstick-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unstick" state="pressed">
+    <draw_ops>
+      <include name="active_button_pressed"/>
+      <image filename="active-unstick-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
+  <button function="unstick" state="prelight">
+    <draw_ops>
+      <include name="active_button_prelight"/>
+      <image filename="active-unstick-button.png" x="2" y="2" width="width-4" height="height-4"/>
+    </draw_ops>
+  </button>
+
   <button function="menu" state="normal">
     <draw_ops>
       <image colorize="gtk:bg[SELECTED]" filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
@@ -642,12 +768,12 @@
 </frame_style>
 
 <frame_style_set name="normal">
-<frame focus="yes" state="shaded" style="focused_shaded"/>
+<frame focus="yes" state="shaded" resize="both" style="focused_shaded"/>
 <frame focus="yes" state="normal" resize="both" style="focused"/>
 <frame focus="yes" state="maximized" style="focused_maximized"/>
 <frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/>
 <frame focus="no" state="normal" resize="both" style="normal"/>
-<frame focus="no" state="shaded" style="normal_shaded"/>
+<frame focus="no" state="shaded" resize="both" style="normal_shaded"/>
 <frame focus="no" state="maximized" style="normal_maximized"/>
 <frame focus="no" state="maximized_and_shaded" style="normal_maximized"/>
 </frame_style_set>
@@ -655,11 +781,11 @@
 <frame_style_set name="border">
 <frame focus="yes" state="normal" resize="both" style="border_focused"/>
 <frame focus="yes" state="maximized" style="border_focused"/>
-<frame focus="yes" state="shaded" style="border_focused"/>
+<frame focus="yes" state="shaded" resize="both" style="border_focused"/>
 <frame focus="yes" state="maximized_and_shaded" style="border_focused"/>
 <frame focus="no" state="normal" resize="both" style="border_unfocused"/>
 <frame focus="no" state="maximized" style="border_unfocused"/>
-<frame focus="no" state="shaded" style="border_unfocused"/>
+<frame focus="no" state="shaded" resize="both" style="border_unfocused"/>
 <frame focus="no" state="maximized_and_shaded" style="border_unfocused"/>
 </frame_style_set>