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)

13 files changed, 39 insertions, 72 deletions

diff --git a/src/themes/AgingGorilla/active-button.png b/src/themes/AgingGorilla/active-button.png
index a299ddb..64455b3 100644
--- a/src/themes/AgingGorilla/active-button.png
+++ b/src/themes/AgingGorilla/active-button.png
diff --git a/src/themes/AgingGorilla/active-close-button.png b/src/themes/AgingGorilla/active-close-button.png
index b77f77a..1d29216 100644
--- a/src/themes/AgingGorilla/active-close-button.png
+++ b/src/themes/AgingGorilla/active-close-button.png
diff --git a/src/themes/AgingGorilla/active-close-menu-icon.png b/src/themes/AgingGorilla/active-close-menu-icon.png
new file mode 100644
index 0000000..b77f77a
--- /dev/null
+++ b/src/themes/AgingGorilla/active-close-menu-icon.png
diff --git a/src/themes/AgingGorilla/active-maximize-button.png b/src/themes/AgingGorilla/active-maximize-button.png
index 02ccc37..a982e5c 100644
--- a/src/themes/AgingGorilla/active-maximize-button.png
+++ b/src/themes/AgingGorilla/active-maximize-button.png
diff --git a/src/themes/AgingGorilla/active-maximize-menu-icon.png b/src/themes/AgingGorilla/active-maximize-menu-icon.png
new file mode 100644
index 0000000..02ccc37
--- /dev/null
+++ b/src/themes/AgingGorilla/active-maximize-menu-icon.png
diff --git a/src/themes/AgingGorilla/active-menu-button.png b/src/themes/AgingGorilla/active-menu-button.png
index aa12b49..b55d707 100644
--- a/src/themes/AgingGorilla/active-menu-button.png
+++ b/src/themes/AgingGorilla/active-menu-button.png
diff --git a/src/themes/AgingGorilla/active-minimize-button.png b/src/themes/AgingGorilla/active-minimize-button.png
index 2927692..4205f4e 100644
--- a/src/themes/AgingGorilla/active-minimize-button.png
+++ b/src/themes/AgingGorilla/active-minimize-button.png
diff --git a/src/themes/AgingGorilla/active-minimize-menu-icon.png b/src/themes/AgingGorilla/active-minimize-menu-icon.png
new file mode 100644
index 0000000..2927692
--- /dev/null
+++ b/src/themes/AgingGorilla/active-minimize-menu-icon.png
diff --git a/src/themes/AgingGorilla/inactive-close-button.png b/src/themes/AgingGorilla/inactive-close-button.png
index 8635992..c566b12 100644
--- a/src/themes/AgingGorilla/inactive-close-button.png
+++ b/src/themes/AgingGorilla/inactive-close-button.png
diff --git a/src/themes/AgingGorilla/inactive-maximize-button.png b/src/themes/AgingGorilla/inactive-maximize-button.png
index 4e89299..9c83882 100644
--- a/src/themes/AgingGorilla/inactive-maximize-button.png
+++ b/src/themes/AgingGorilla/inactive-maximize-button.png
diff --git a/src/themes/AgingGorilla/inactive-menu-button.png b/src/themes/AgingGorilla/inactive-menu-button.png
index 99476b7..b000a37 100644
--- a/src/themes/AgingGorilla/inactive-menu-button.png
+++ b/src/themes/AgingGorilla/inactive-menu-button.png
diff --git a/src/themes/AgingGorilla/inactive-minimize-button.png b/src/themes/AgingGorilla/inactive-minimize-button.png
index 125aa6f..4459af4 100644
--- a/src/themes/AgingGorilla/inactive-minimize-button.png
+++ b/src/themes/AgingGorilla/inactive-minimize-button.png
diff --git a/src/themes/AgingGorilla/metacity-theme-1.xml b/src/themes/AgingGorilla/metacity-theme-1.xml
index fd9290f..7dde366 100644
--- a/src/themes/AgingGorilla/metacity-theme-1.xml
+++ b/src/themes/AgingGorilla/metacity-theme-1.xml
@@ -18,32 +18,15 @@
   <distance name="bottom_height" value="6"/>
   <distance name="left_titlebar_edge" value="8"/>
   <distance name="right_titlebar_edge" value="8"/>
-  <distance name="button_width" value="18"/>
-  <distance name="button_height" value="18"/>
+  <aspect_ratio name="button" value="1.0"/>
   <distance name="title_vertical_pad" value="0"/>
-  <border name="title_border" left="0" right="0" top="4" bottom="0"/>
-  <border name="button_border" left="0" right="0" top="8" bottom="0"/>
+  <border name="title_border" left="0" right="0" top="7" bottom="4"/>
+  <border name="button_border" left="0" right="0" top="9" bottom="0"/>
 </frame_geometry>
 
 
 <!-- Buttons -->
 
-<draw_ops name="active_button">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="active_button_pressed">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="inactive_button">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="inactive_button_pressed">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
 <draw_ops name="title_tile">
   <line color="#494d59" x1="0" y1="0" x2="width" y2="0"/>
   <line color="#515961" x1="0" y1="1" x2="width" y2="1"/>
@@ -58,82 +41,73 @@
       <rectangle color="light gray" x="4" y="4" width="width - 9" height="height - 8" filled="false"/>
       <rectangle color="light gray" x="5" y="5" width="width - 11" height="height - 10" filled="false"/>
       <rectangle color="white" x="6" y="6" width="width - 13" height="height - 12" filled="false"/>
-      <rectangle color="gray" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
+      <rectangle color="gtk:bg[INSENSITIVE]" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
 
-      <line color="gray" x1="1" y1="1" x2="2" y2="2"/>
-      <line color="gray" x1="1" y1="height - 2" x2="1" y2="height"/>
-      <line color="gray" x1="width - 2" y1="1" x2="width - 1" y2="2"/>
-      <line color="gray" x1="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="1" y1="1" x2="2" y2="2"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="1" y1="height - 2" x2="1" y2="height"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="width - 2" y1="1" x2="width - 1" y2="2"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/>
    </draw_ops>
   </piece>
 
   <piece position="title">
     <draw_ops>
-      <title color="gray" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/>
+      <title color="gray" x="IconTitleSpacing" y="0"/>
     </draw_ops>
   </piece>
 
   <piece position="titlebar">
-
     <draw_ops>
-      <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/>
-      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/>
+      <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/>
+      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
     </draw_ops>
   </piece>
 
   <button function="close" state="normal">
     <draw_ops>
-      <include name="inactive_button"/>
-      <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
-      <include name="inactive_button"/>
-      <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
-      <include name="inactive_button"/>
-      <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="normal">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-menu-button.png" x="4.5" y="3.5" 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>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
@@ -155,81 +129,73 @@
       <rectangle color="light gray" x="4" y="4" width="width - 9" height="height - 8" filled="false"/>
       <rectangle color="light gray" x="5" y="5" width="width - 11" height="height - 10" filled="false"/>
       <rectangle color="white" x="6" y="6" width="width - 13" height="height - 12" filled="false"/>
-      <rectangle color="gray" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
+      <rectangle color="gtk:bg[NORMAL]" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
 
-      <line color="gray" x1="0" y1="0" x2="1" y2="1"/>
-      <line color="gray" x1="0" y1="height - 1" x2="1" y2="height"/>
-      <line color="gray" x1="width - 1" y1="0" x2="width" y2="1"/>
-      <line color="gray" x1="width" y1="height" x2="width - 1" y2="height - 1"/>
+      <line color="gtk:bg[NORMAL]" x1="0" y1="0" x2="1" y2="1"/>
+      <line color="gtk:bg[NORMAL]" x1="0" y1="height - 1" x2="1" y2="height"/>
+      <line color="gtk:bg[NORMAL]" x1="width - 1" y1="0" x2="width" y2="1"/>
+      <line color="gtk:bg[NORMAL]" x1="width" y1="height" x2="width - 1" y2="height - 1"/>
    </draw_ops>
   </piece>
 
   <piece position="title">
     <draw_ops>
-      <title color="white" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/>
+      <title color="white" x="IconTitleSpacing" y="0"/>
     </draw_ops>
   </piece>
 
   <piece position="titlebar">
     <draw_ops>
-      <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/>
-      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/>
+      <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/>
+      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
     </draw_ops>
   </piece>
 
   <button function="close" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
@@ -256,10 +222,11 @@
 <window type="modal_dialog" style_set="normal"/>
 <window type="menu" style_set="normal"/>
 <window type="utility" style_set="normal"/>
+<window type="border" style_set="normal"/>
 
 <menu_icon function="maximize" state="normal">
   <draw_ops>
-    <image filename="active-maximize-button.png" 
+    <image filename="active-maximize-menu-icon.png" 
            x="(width - object_width) / 2"
            y="(height - object_height) / 2"
            width="object_width" height="object_height"/>
@@ -269,7 +236,7 @@
 
 <menu_icon function="close" state="normal">
   <draw_ops>
-    <image filename="active-close-button.png" 
+    <image filename="active-close-menu-icon.png" 
            x="(width - object_width) / 2"
            y="(height - object_height) / 2"
            width="object_width" height="object_height"/>
@@ -278,7 +245,7 @@
 
 <menu_icon function="minimize" state="normal">
   <draw_ops>
-    <image filename="active-minimize-button.png" 
+    <image filename="active-minimize-menu-icon.png" 
            x="(width - object_width) / 2"
            y="(height - object_height) / 2"
            width="object_width" height="object_height"/>