From 24c91c3a37a9b44a7fd9b13ff933af6d7b94cf76 Mon Sep 17 00:00:00 2001
From: "James M. Cape" <jcape@ignore-your.tv>
Date: Thu, 6 Jun 2002 13:56:16 +0000
Subject: [PATCH] Increase the border size of the buttons so they aren't quite
 so huge on my

2002-06-06  James M. Cape <jcape@ignore-your.tv>

    * src/themes/Esco/metacity-theme-1.xml: Increase the border size
	of the buttons so they aren't quite so huge on my box. Also get
	a *little* closer to finally fixing the horizontal line behind
	the icon. It now works decently with common font sizes (in pixels).
---
 ChangeLog                            |  7 +++++++
 src/themes/Esco/metacity-theme-1.xml | 21 ++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d494eeb80..7bfb1a460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-06  James M. Cape <jcape@ignore-your.tv>
+
+	* src/themes/Esco/metacity-theme-1.xml: Increase the border size
+	of the buttons so they aren't quite so huge on my box. Also get
+	a *little* closer to finally fixing the horizontal line behind
+	the icon. It now works decently with common font sizes (in pixels).
+
 2002-06-05  Havoc Pennington  <hp@pobox.com>
 
 	* src/theme.c (meta_color_spec_new_from_string): parse 
diff --git a/src/themes/Esco/metacity-theme-1.xml b/src/themes/Esco/metacity-theme-1.xml
index d59ddaf9d..43ad44152 100644
--- a/src/themes/Esco/metacity-theme-1.xml
+++ b/src/themes/Esco/metacity-theme-1.xml
@@ -15,10 +15,10 @@
  	<distance name="bottom_height" value="5"/>
 	<distance name="left_titlebar_edge" value="5"/>
 	<distance name="right_titlebar_edge" value="5"/>
-        <aspect_ratio name="button" value="1.0"/>      
+	<aspect_ratio name="button" value="1.0"/> 
 	<distance name="title_vertical_pad" value="3"/>
 	<border name="title_border" left="3" right="3" top="4" bottom="3"/>
-	<border name="button_border" left="0" right="1" top="4" bottom="3"/>
+	<border name="button_border" left="0" right="1" top="6" bottom="5"/>
 </frame_geometry>
 
 <!-- strip borders off the normal geometry -->
@@ -38,11 +38,10 @@
 	<distance name="bottom_height" value="4"/>
 	<distance name="left_titlebar_edge" value="3"/>
 	<distance name="right_titlebar_edge" value="3"/>
-	<distance name="button_width" value="11"/>
-	<distance name="button_height" value="11"/>
+	<aspect_ratio name="button" value="1.0"/>      
 	<distance name="title_vertical_pad" value="1"/>
 	<border name="title_border" left="3" right="4" top="3" bottom="3"/>
-	<border name="button_border" left="0" right="0" top="1" bottom="1"/>
+	<border name="button_border" left="0" right="0" top="2" bottom="2"/>
 </frame_geometry>
 
 <!-- define constants -->
@@ -194,7 +193,7 @@
 		y2="height - ButtonIPad - 2"/>
 
 	<line color="gtk:fg[NORMAL]" width="2"
-		x1="ButtonIPad"
+		x1="ButtonIPad + 1"
 		y1="height - ButtonIPad - 2"
 		x2="width - ButtonIPad - 2"
 		y2="ButtonIPad + 1"/>
@@ -206,7 +205,7 @@
 		x2="width - ButtonIPad - 2"
 		y2="height - ButtonIPad - 2"/>
 	<line color="gtk:fg[INSENSITIVE]" width="2"
-		x1="ButtonIPad"
+		x1="ButtonIPad + 1"
 		y1="height - ButtonIPad - 2"
 		x2="width - ButtonIPad - 2"
 		y2="ButtonIPad + 1"/>
@@ -325,10 +324,10 @@
 		width="title_width + IconTitleSpacing"
 		height="height - 4"/>
 	<line color="#ffffff" width="32"
-		x1="width - title_width - (IconTitleSpacing * 1.5) + height + (IconTitleSpacing * 2) + (height / 3)"
-		y1="0 - height"
-		x2="width - title_width - (IconTitleSpacing * 1.5) - height + (height / 8)"
-		y2="height + height"/>
+		x1="width - title_width + height + IconTitleSpacing + (height / 12)"
+		y1="0 - height + (height / 6)"
+		x2="width - title_width - height - IconTitleSpacing + (height / 12)"
+		y2="height * 2 - (height / 6)"/>
 </draw_ops>
 
 <draw_ops name="title_text_focused_with_icon">