put Gorilla back in the build

2002-07-23  Havoc Pennington  <hp@redhat.com>

	* src/themes/Makefile.am (THEMES): put Gorilla back in the build

	* src/themes/Gorilla/metacity-theme-1.xml,
	src/themes/Crux/metacity-theme-1.xml: fixes from
	Sebastien Delestaing so that these themes work properly with
	different font sizes.

	* src/frames.c (get_control): patch from Balamurali Viswanathan
	for #81984 (resize titlebar from the top not the bottom)

33 files changed, 59 insertions, 65 deletions

diff --git a/src/themes/Crux/active-border-top-left-border.png b/src/themes/Crux/active-border-top-left-border.png
index ea1e665..2d61acf 100644
--- a/src/themes/Crux/active-border-top-left-border.png
+++ b/src/themes/Crux/active-border-top-left-border.png
diff --git a/src/themes/Crux/active-border-top-right-border.png b/src/themes/Crux/active-border-top-right-border.png
index 521735b..9797c0f 100644
--- a/src/themes/Crux/active-border-top-right-border.png
+++ b/src/themes/Crux/active-border-top-right-border.png
diff --git a/src/themes/Crux/active-bottom-left-border.png b/src/themes/Crux/active-bottom-left-border.png
index c6657c6..e85c329 100644
--- a/src/themes/Crux/active-bottom-left-border.png
+++ b/src/themes/Crux/active-bottom-left-border.png
diff --git a/src/themes/Crux/active-bottom-right-border.png b/src/themes/Crux/active-bottom-right-border.png
index ed25d07..4bcfe8a 100644
--- a/src/themes/Crux/active-bottom-right-border.png
+++ b/src/themes/Crux/active-bottom-right-border.png
diff --git a/src/themes/Crux/active-button-prelight.png b/src/themes/Crux/active-button-prelight.png
index 7c8aa2f..6da2ae2 100644
--- a/src/themes/Crux/active-button-prelight.png
+++ b/src/themes/Crux/active-button-prelight.png
diff --git a/src/themes/Crux/active-button-pressed.png b/src/themes/Crux/active-button-pressed.png
index b3c7bcc..4fb94aa 100644
--- a/src/themes/Crux/active-button-pressed.png
+++ b/src/themes/Crux/active-button-pressed.png
diff --git a/src/themes/Crux/active-button.png b/src/themes/Crux/active-button.png
index 5269b51..cd93b8c 100644
--- a/src/themes/Crux/active-button.png
+++ b/src/themes/Crux/active-button.png
diff --git a/src/themes/Crux/active-left-border.png b/src/themes/Crux/active-left-border.png
index eb74fe8..699a2d2 100644
--- a/src/themes/Crux/active-left-border.png
+++ b/src/themes/Crux/active-left-border.png
diff --git a/src/themes/Crux/active-left-top-border.png b/src/themes/Crux/active-left-top-border.png
index 7268769..567b4a0 100644
--- a/src/themes/Crux/active-left-top-border.png
+++ b/src/themes/Crux/active-left-top-border.png
diff --git a/src/themes/Crux/active-menu-button-prelight.png b/src/themes/Crux/active-menu-button-prelight.png
index 794f6db..db0a88c 100644
--- a/src/themes/Crux/active-menu-button-prelight.png
+++ b/src/themes/Crux/active-menu-button-prelight.png
diff --git a/src/themes/Crux/active-menu-button-pressed.png b/src/themes/Crux/active-menu-button-pressed.png
index dbdc18e..8ac8201 100644
--- a/src/themes/Crux/active-menu-button-pressed.png
+++ b/src/themes/Crux/active-menu-button-pressed.png
diff --git a/src/themes/Crux/active-menu-button.png b/src/themes/Crux/active-menu-button.png
index 8b110f5..de8e1a7 100644
--- a/src/themes/Crux/active-menu-button.png
+++ b/src/themes/Crux/active-menu-button.png
diff --git a/src/themes/Crux/active-right-border.png b/src/themes/Crux/active-right-border.png
index 61c84b1..bcb5466 100644
--- a/src/themes/Crux/active-right-border.png
+++ b/src/themes/Crux/active-right-border.png
diff --git a/src/themes/Crux/active-right-top-border.png b/src/themes/Crux/active-right-top-border.png
index 4dd314f..8b50f04 100644
--- a/src/themes/Crux/active-right-top-border.png
+++ b/src/themes/Crux/active-right-top-border.png
diff --git a/src/themes/Crux/active-top-center-left.png b/src/themes/Crux/active-top-center-left.png
index 7275abb..aee3b76 100644
--- a/src/themes/Crux/active-top-center-left.png
+++ b/src/themes/Crux/active-top-center-left.png
diff --git a/src/themes/Crux/active-top-center-mid-left.png b/src/themes/Crux/active-top-center-mid-left.png
index 5667836..927d50e 100644
--- a/src/themes/Crux/active-top-center-mid-left.png
+++ b/src/themes/Crux/active-top-center-mid-left.png
diff --git a/src/themes/Crux/inactive-border-top-left-border.png b/src/themes/Crux/inactive-border-top-left-border.png
index 61e7dc9..0f6a1b8 100644
--- a/src/themes/Crux/inactive-border-top-left-border.png
+++ b/src/themes/Crux/inactive-border-top-left-border.png
diff --git a/src/themes/Crux/inactive-border-top-right-border.png b/src/themes/Crux/inactive-border-top-right-border.png
index 819d66c..0e37f50 100644
--- a/src/themes/Crux/inactive-border-top-right-border.png
+++ b/src/themes/Crux/inactive-border-top-right-border.png
diff --git a/src/themes/Crux/inactive-bottom-left-border.png b/src/themes/Crux/inactive-bottom-left-border.png
index 3cb1ecc..6d5e0ec 100644
--- a/src/themes/Crux/inactive-bottom-left-border.png
+++ b/src/themes/Crux/inactive-bottom-left-border.png
diff --git a/src/themes/Crux/inactive-bottom-right-border.png b/src/themes/Crux/inactive-bottom-right-border.png
index cfd0c6c..3302e01 100644
--- a/src/themes/Crux/inactive-bottom-right-border.png
+++ b/src/themes/Crux/inactive-bottom-right-border.png
diff --git a/src/themes/Crux/inactive-button-prelight.png b/src/themes/Crux/inactive-button-prelight.png
index 49be9fd..070a164 100644
--- a/src/themes/Crux/inactive-button-prelight.png
+++ b/src/themes/Crux/inactive-button-prelight.png
diff --git a/src/themes/Crux/inactive-button-pressed.png b/src/themes/Crux/inactive-button-pressed.png
index d215f9a..88f3f8a 100644
--- a/src/themes/Crux/inactive-button-pressed.png
+++ b/src/themes/Crux/inactive-button-pressed.png
diff --git a/src/themes/Crux/inactive-button.png b/src/themes/Crux/inactive-button.png
index a13abff..e74564d 100644
--- a/src/themes/Crux/inactive-button.png
+++ b/src/themes/Crux/inactive-button.png
diff --git a/src/themes/Crux/inactive-left-border.png b/src/themes/Crux/inactive-left-border.png
index 681a566..a98ee93 100644
--- a/src/themes/Crux/inactive-left-border.png
+++ b/src/themes/Crux/inactive-left-border.png
diff --git a/src/themes/Crux/inactive-left-top-border.png b/src/themes/Crux/inactive-left-top-border.png
index 50ed2a8..1269434 100644
--- a/src/themes/Crux/inactive-left-top-border.png
+++ b/src/themes/Crux/inactive-left-top-border.png
diff --git a/src/themes/Crux/inactive-menu-button-prelight.png b/src/themes/Crux/inactive-menu-button-prelight.png
index ecf6f94..8c45a1b 100644
--- a/src/themes/Crux/inactive-menu-button-prelight.png
+++ b/src/themes/Crux/inactive-menu-button-prelight.png
diff --git a/src/themes/Crux/inactive-menu-button-pressed.png b/src/themes/Crux/inactive-menu-button-pressed.png
index a3a4ab8..757ff7c 100644
--- a/src/themes/Crux/inactive-menu-button-pressed.png
+++ b/src/themes/Crux/inactive-menu-button-pressed.png
diff --git a/src/themes/Crux/inactive-menu-button.png b/src/themes/Crux/inactive-menu-button.png
index e6961df..89b2a44 100644
--- a/src/themes/Crux/inactive-menu-button.png
+++ b/src/themes/Crux/inactive-menu-button.png
diff --git a/src/themes/Crux/inactive-right-border.png b/src/themes/Crux/inactive-right-border.png
index e9a009f..206375b 100644
--- a/src/themes/Crux/inactive-right-border.png
+++ b/src/themes/Crux/inactive-right-border.png
diff --git a/src/themes/Crux/inactive-right-top-border.png b/src/themes/Crux/inactive-right-top-border.png
index e8a523b..8b225ae 100644
--- a/src/themes/Crux/inactive-right-top-border.png
+++ b/src/themes/Crux/inactive-right-top-border.png
diff --git a/src/themes/Crux/inactive-top-center-left.png b/src/themes/Crux/inactive-top-center-left.png
index d281f92..f901f13 100644
--- a/src/themes/Crux/inactive-top-center-left.png
+++ b/src/themes/Crux/inactive-top-center-left.png
diff --git a/src/themes/Crux/inactive-top-center-right.png b/src/themes/Crux/inactive-top-center-right.png
index 2ea82f3..c4ec5ee 100644
--- a/src/themes/Crux/inactive-top-center-right.png
+++ b/src/themes/Crux/inactive-top-center-right.png
diff --git a/src/themes/Crux/metacity-theme-1.xml b/src/themes/Crux/metacity-theme-1.xml
index 88da751..b2219df 100644
--- a/src/themes/Crux/metacity-theme-1.xml
+++ b/src/themes/Crux/metacity-theme-1.xml
@@ -19,11 +19,10 @@
   <distance name="bottom_height" value="6"/>
   <distance name="left_titlebar_edge" value="5"/>
   <distance name="right_titlebar_edge" value="6"/>
-  <distance name="button_width" value="16"/>
-  <distance name="button_height" value="16"/>
-  <distance name="title_vertical_pad" value="6"/>
-  <border name="title_border" left="0" right="0" top="0" bottom="0"/>
-  <border name="button_border" left="0" right="0" top="0" bottom="0"/>
+  <aspect_ratio name="button" value="1.0"/>
+  <distance name="title_vertical_pad" value="0"/>
+  <border name="title_border" left="0" right="0" top="3" bottom="3"/>
+  <border name="button_border" left="0" right="0" top="3" bottom="3"/>
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false">
@@ -34,7 +33,7 @@
   <distance name="right_titlebar_edge" value="0"/>
   <distance name="button_width" value="0"/>
   <distance name="button_height" value="0"/>
-  <distance name="title_vertical_pad" value="6"/>
+  <distance name="title_vertical_pad" value="5"/>
   <border name="title_border" left="0" right="0" top="0" bottom="0"/>
   <border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
@@ -42,27 +41,27 @@
 <!-- Buttons -->
 
 <draw_ops name="active_button">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="active-button.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="active_button_pressed">
-  <image filename="active-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="active-button-pressed.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="active_button_prelight">
-  <image filename="active-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="active-button-prelight.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="inactive_button">
-  <image filename="inactive-button.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="inactive-button.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="inactive_button_pressed">
-  <image filename="inactive-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="inactive-button-pressed.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="inactive_button_prelight">
-  <image filename="inactive-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="inactive-button-prelight.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <!-- Inactive style -->
@@ -81,37 +80,34 @@
 
   <piece position="title">
     <draw_ops>
-      <title color="white" x="IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/>
+      <title color="white" x="IconTitleSpacing" y="0"/>
     </draw_ops>
   </piece>
 
   <piece position="titlebar">
     <draw_ops>
-      <image filename="inactive-left-top-border.png" 
-             x="0" y="3" width="object_width" height="height"/>
-      <image filename="inactive-top-left-border.png" 
-             x="0" y="0" width="object_width" height="object_height"/> 
 
-      <image filename="inactive-top-right-border.png" 
-             x="width - object_width" y="0" width="object_width" height="object_height"/>
+      <image filename="inactive-left-top-border.png" 
+             x="0" y="0" width="object_width" height="height"/>
       <image filename="inactive-right-top-border.png" 
-             x="width - object_width" y="3" width="object_width" height="object_height"/>
+             x="width - object_width" y="0" width="object_width" height="height"/>
 
       <image filename="inactive-top-center-left.png" 
              x="4" y="0" 
              width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min`
                     (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" 
-             height="object_height"/>
+             height="height"/>
 
       <image filename="inactive-top-center-mid.png" 
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1"
-             y="0" width="object_width" height="object_height"/>
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
+             y="0" width="object_width * height / 22" height="height"/>
 
       <image filename="inactive-top-center-right.png"
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth) `min` (width - 3 * ButtonWidth - right_width)) + 1"
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth * height / 22) `min` (width - 3 * ButtonWidth - right_width)) + 1"
              y="0"
-             width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)"
-             height="object_height"/>
+             width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth * height / 22 - right_width) `max` (3 * ButtonWidth)"
+             height="height"/>
+
     </draw_ops>
   </piece>
 
@@ -143,80 +139,80 @@
   <button function="close" state="normal">
     <draw_ops>
       <include name="inactive_button"/>
-      <image filename="inactive-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
       <include name="inactive_button_pressed"/>
-      <image filename="inactive-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="close" state="prelight">
     <draw_ops>
       <include name="inactive_button_prelight"/>
-      <image filename="inactive-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
       <include name="inactive_button"/>
-      <image filename="inactive-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
       <include name="inactive_button_pressed"/>
-      <image filename="inactive-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="prelight">
     <draw_ops>
       <include name="inactive_button_prelight"/>
-      <image filename="inactive-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
       <include name="inactive_button"/>
-      <image filename="inactive-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
       <include name="inactive_button_pressed"/>
-      <image filename="inactive-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="2" y="2" width="width - 4" height="height - 4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="prelight">
     <draw_ops>
       <include name="inactive_button_prelight"/>
-      <image filename="inactive-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-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="object_width" height="object_height"/>
+      <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <image filename="inactive-menu-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button-pressed.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
   <button function="menu" state="prelight">
     <draw_ops>
-      <image filename="inactive-menu-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button-prelight.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 </frame_style>
@@ -258,38 +254,36 @@
 
   <piece position="titlebar">
     <draw_ops>
+
       <image filename="active-left-top-border.png" 
              colorize="gtk:bg[SELECTED]"
-             x="0" y="3" width="object_width" height="height"/>
-      <image filename="active-top-left-border.png" 
-             colorize="gtk:bg[SELECTED]"
-             x="0" y="0" width="object_width" height="object_height"/> 
+             x="0" y="0" width="object_width" height="height"/>
 
-      <image filename="active-top-right-border.png" 
-             x="width - object_width" y="0" width="object_width" height="object_height"/>
       <image filename="active-right-top-border.png" 
-             x="width - object_width" y="3" width="object_width" height="object_height"/>
+             x="width - object_width" y="0" width="object_width" height="height"/>
 
       <image filename="active-top-center-left.png" 
              colorize="gtk:bg[SELECTED]"
              x="4" y="0" 
              width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min`
                     (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" 
-             height="object_height"/>
+             height="height"/>
 
       <image filename="active-top-center-mid-left.png" 
              colorize="gtk:bg[SELECTED]"
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1"
-             y="0" width="object_width" height="object_height"/>
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
+             y="0" width="object_width * height / 22" height="height"/>
+
       <image filename="active-top-center-mid-right.png" 
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1"
-             y="0" width="object_width" height="object_height"/>
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
+             y="0" width="object_width * height / 22" height="height"/>
 
       <image filename="active-top-center-right.png"
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth) `min` (width - 3 * ButtonWidth - right_width)) + 1"
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth * height / 22) `min` (width - 3 * ButtonWidth - right_width)) + 1"
              y="0"
-             width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)"
-             height="object_height"/>
+             width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth * height / 22 - right_width) `max` (3 * ButtonWidth)"
+             height="height"/>
+
     </draw_ops>
   </piece>
 
@@ -327,80 +321,80 @@
   <button function="close" state="normal">
     <draw_ops>
       <include name="active_button"/>
-      <image filename="active-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
       <include name="active_button_pressed"/>
-      <image filename="active-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="close" state="prelight">
     <draw_ops>
       <include name="active_button_prelight"/>
-      <image filename="active-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
       <include name="active_button"/>
-      <image filename="active-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
       <include name="active_button_pressed"/>
-      <image filename="active-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="prelight">
     <draw_ops>
       <include name="active_button_prelight"/>
-      <image filename="active-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
       <include name="active_button"/>
-      <image filename="active-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
       <include name="active_button_pressed"/>
-      <image filename="active-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="prelight">
     <draw_ops>
       <include name="active_button_prelight"/>
-      <image filename="active-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-maximize-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="object_width" height="object_height"/>
+      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-pressed.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
   <button function="menu" state="prelight">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-prelight.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 </frame_style>