Menta: move buttons a bit to right edge

2 files changed, 25 insertions, 31 deletions

diff --git a/desktop-themes/Menta/metacity-1/metacity-theme-1.xml b/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
index a2589835..3ea69a02 100644
--- a/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
@@ -14,8 +14,8 @@
  	<distance name="left_width" value="1"/>
 	<distance name="right_width" value="1"/>
 	<distance name="bottom_height" value="1"/>
-	<distance name="left_titlebar_edge" value="6"/>
-	<distance name="right_titlebar_edge" value="6"/>
+	<distance name="left_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="1"/>
 	<distance name="button_width" value="24"/>
 	<distance name="button_height" value="24"/>
 	<distance name="title_vertical_pad" value="8"/>
@@ -27,8 +27,8 @@
   	<distance name="left_width" value="0"/>
   	<distance name="right_width" value="0"/>
   	<distance name="bottom_height" value="0"/>
-  	<distance name="left_titlebar_edge" value="6"/>
-  	<distance name="right_titlebar_edge" value="6"/>
+  	<distance name="left_titlebar_edge" value="4"/>
+  	<distance name="right_titlebar_edge" value="1"/>
   	<distance name="button_width" value="24"/>
  	<distance name="button_height" value="24"/>
   	<distance name="title_vertical_pad" value="2"/>
@@ -36,17 +36,17 @@
 	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
-<frame_geometry name="geometry_maximized" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
+<frame_geometry name="geometry_maximized" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false">
 	<distance name="left_width" value="0"/>
 	<distance name="right_width" value="0"/>
 	<distance name="bottom_height" value="0"/>
 	<distance name="left_titlebar_edge" value="4"/>
-  	<distance name="right_titlebar_edge" value="4"/>
+  	<distance name="right_titlebar_edge" value="1"/>
   	<distance name="button_width" value="24"/>
   	<distance name="button_height" value="24"/>
   	<distance name="title_vertical_pad" value="8"/>
-  	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
- 	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+  	<border name="title_border" left="2" right="2" top="4" bottom="0"/>
+ 	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false">
@@ -86,7 +86,6 @@
 
 	<!-- Topmost lines -->
 	<line color="shade/#3c3c3c/1.2" x1="0" x2="width" y1="0" y2="0"/>
-	<line color="shade/#f7f7f7/1.1" x1="0" x2="width" y1="1" y2="1"/>
 	
 	<!-- Darkening of the left arch -->
 	<line color="shade/#3c3c3c/1.2" x1="0" x2="4" y1="1" y2="1"/>
@@ -114,7 +113,6 @@
 
 	<!-- Topmost lines -->
 	<line color="shade/#3c3c3c/1.16" x1="0" x2="width" y1="0" y2="0"/>
-	<line color="shade/#f7f7f7/1.14" x1="0" x2="width" y1="1" y2="1"/>
 	
 	<!-- Darkening of the left arch -->
 	<line color="shade/#3c3c3c/1.2" x1="0" x2="4" y1="1" y2="1"/>
@@ -142,9 +140,7 @@
 	</gradient>
 	
 	<!-- Topmost dark line -->
-	<line color="shade/#f7f7f7/1.1" x1="0" x2="width" y1="0" y2="0"/>
-	
-	<line color="shade/#3c3c3c/0.94" x1="1" y1="top_height - 0" x2="width - 2" y2="top_height - 0"/>
+	<line color="shade/#3c3c3c/1.16" x1="0" x2="width" y1="0" y2="0"/>
 </draw_ops>
 
 <draw_ops name="draw_title_maximized_unfocused">
@@ -155,9 +151,7 @@
 	</gradient>
 	
 	<!-- Topmost dark line -->
-	<line color="shade/#f7f7f7/1.1" x1="0" x2="width" y1="0" y2="0"/>
-	
-	<line color="shade/#f7f7f7/0.94" x1="1" y1="top_height - 0" x2="width - 2" y2="top_height - 0"/>
+	<line color="shade/#3c3c3c/1.16" x1="0" x2="width" y1="0" y2="0"/>
 </draw_ops>
 
 <draw_ops name="draw_title_maximized_inactive">
diff --git a/desktop-themes/Menta/metacity-1/metacity-theme-3.xml b/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
index b54dfdcb..4ab663d8 100644
--- a/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
+++ b/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
@@ -30,29 +30,29 @@
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
 	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="4"/>
-	<distance name="title_vertical_pad" value="9"/>
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
+	<distance name="right_titlebar_edge" value="1"/>
+	<distance name="title_vertical_pad" value="8"/>
+	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
+	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
 	<aspect_ratio name="button" value="1"/>
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
 	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="1"/>
 </frame_geometry>
 
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
+<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="true" rounded_top_right="true">
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="1"/>
 	<distance name="title_vertical_pad" value="8"/> <!-- 
 							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="title_border" left="2" right="2" top="4" bottom="0"/>
+	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
 	<distance name="bottom_height" value="0" />
 </frame_geometry>
 
@@ -137,23 +137,23 @@
 
 <draw_ops name="titlebar_fill_focused">
 	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
+		<color value="#e8e8e8" />
+		<color value="#d2d2d2" />
 	</gradient>
 </draw_ops>
 
 
 <draw_ops name="titlebar_fill_attached_focused"> <!-- gradient for attached and modal dialogs titlebar-->
 	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
+		<color value="#e8e8e8" />
+		<color value="#d2d2d2" />
 	</gradient>
 </draw_ops>
 
 <draw_ops name="titlebar_fill_unfocused">
 	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.9)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
+		<color value="#e8e8e8" />
+		<color value="#d2d2d2" />
 	</gradient>
 </draw_ops>