[gnome-themes-standard] window decorations: made attached and modal dialogs to be more similar to mockups.

[Lapo Calamandrei <lapo src gnome org>]

commit 93d45dd12035bf2c9bc52beb9b2ca9acad841546
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri Nov 26 11:56:10 2010 +0100

    window decorations: made attached and modal dialogs to be more similar to mockups.

 themes/Adwaita/metacity-1/metacity-theme-2.xml |   27 ++++++++++++-----
 themes/Adwaita/metacity-1/metacity-theme-3.xml |   36 +++++++++++++----------
 2 files changed, 39 insertions(+), 24 deletions(-)
---
diff --git a/themes/Adwaita/metacity-1/metacity-theme-2.xml b/themes/Adwaita/metacity-1/metacity-theme-2.xml
index 861b976..e048245 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-2.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-2.xml
@@ -79,8 +79,8 @@
 	<distance name="title_vertical_pad" value="1" />
 </frame_geometry>
 
-<frame_geometry name="attached" has_title="false" parent="borderless">
-	<distance name="title_vertical_pad" value="10" />
+<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
+	<distance name="title_vertical_pad" value="5"/>
 </frame_geometry>
 
 <!-- drawing operations -->
@@ -127,6 +127,14 @@
 	</gradient>
 </draw_ops>
 
+<draw_ops name="titlebar_fill_focused_alt2"> <!-- gradient for attached and modal dialogs titlebar-->
+	<gradient type="vertical" x="0" y="0" width="width" height="title_height">
+		<color value="gtk:bg[NORMAL]"/>
+		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.4" />
+		<color value="gtk:bg[NORMAL]" />
+	</gradient>
+</draw_ops>
+
 <draw_ops name="titlebar_fill_unfocused">
 	<rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" />
 </draw_ops>
@@ -159,6 +167,10 @@
 	<include name="hilight" />
 </draw_ops>
 
+<draw_ops name="titlebar_focused_alt"> <!-- titlebar for attached and modal dialogs -->
+	<include name="titlebar_fill_focused_alt2" />
+</draw_ops>
+
 <draw_ops name="rounded_titlebar_focused">
 	<include name="titlebar_fill_focused" />
 	<include name="rounded_hilight" />
@@ -1077,11 +1089,11 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="modal_dialog_focused" geometry="nobuttons">
+<frame_style name="modal_dialog_focused" geometry="modal">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused_alt" />
+	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
 	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
+	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
@@ -1118,11 +1130,11 @@
 	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="modal_dialog_unfocused" geometry="nobuttons">
+<frame_style name="modal_dialog_unfocused" geometry="modal">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
 	<piece position="titlebar" draw_ops="titlebar_unfocused" />
 	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
+	<piece position="overlay" draw_ops="border_unfocused" />
 	<button function="close" state="normal" draw_ops="close_unfocused"/>
 	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
 	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
@@ -1149,7 +1161,6 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-
 <frame_style name="utility_focused" geometry="small">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
 	<piece position="titlebar" draw_ops="titlebar_focused" />
diff --git a/themes/Adwaita/metacity-1/metacity-theme-3.xml b/themes/Adwaita/metacity-1/metacity-theme-3.xml
index 8cae27b..385d413 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-3.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-3.xml
@@ -24,7 +24,7 @@
 <constant name="C_icons_unfocused_prelight" value="gtk:bg[NORMAL]" />
 <constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
 <constant name="D_icons_unfocused_offset" value="2" /> <!-- offset of the unfocused icons -->
-<constant name="D_icons_shrink" value="1" /> <!-- increasing this value makes the icons in buttons smaller -->
+<constant name="D_icons_shrink" value="0" /> <!-- increasing this value makes the icons in buttons smaller -->
 <constant name="D_icons_grow" value="0" /> <!-- increasing this value makes the icons in buttons bigger -->
 <!-- geometries -->
 
@@ -34,7 +34,7 @@
 	<distance name="bottom_height" value="2" />
 	<distance name="left_titlebar_edge" value="0"/>
 	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="15"/>
+	<distance name="title_vertical_pad" value="10"/>
 	<border name="title_border" left="10" right="10" top="1" bottom="1"/>
 	<border name="button_border" left="0" right="0" top="1" bottom="3"/>
 	<aspect_ratio name="button" value="1"/>
@@ -70,7 +70,7 @@
 <frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
 </frame_geometry>
 
-<frame_geometry name="borderless" has_title="false" parent="normal" rounded_top_left="false" rounded_top_right="false">
+<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
 	<distance name="left_width" value="1" />
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
@@ -79,8 +79,12 @@
 	<distance name="title_vertical_pad" value="1" />
 </frame_geometry>
 
-<frame_geometry name="attached" has_title="false" parent="borderless">
-	<distance name="title_vertical_pad" value="10" />
+<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
+	<distance name="title_vertical_pad" value="5"/>
+</frame_geometry>
+
+<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
+	<distance name="title_vertical_pad" value="0"/>
 </frame_geometry>
 
 <!-- drawing operations -->
@@ -144,14 +148,15 @@
 		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.4" />
 		<color value="gtk:bg[NORMAL]"/>
 		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="gtk:bg[NORMAL]" />
+		<color value="gtk:bg[NORMAL]"/>
 	</gradient>
 </draw_ops>
 
-<draw_ops name="titlebar_fill_focused_alt2"> <!-- gradient for attached modal dialogs titlebar-->
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.4" />
+<draw_ops name="titlebar_fill_focused_alt2"> <!-- gradient for attached and modal dialogs titlebar-->
+	<gradient type="vertical" x="0" y="0" width="width" height="title_height">
 		<color value="gtk:bg[NORMAL]"/>
+		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.4" />
+		<color value="gtk:bg[NORMAL]" />
 	</gradient>
 </draw_ops>
 
@@ -187,9 +192,8 @@
 	<include name="hilight" />
 </draw_ops>
 
-<draw_ops name="titlebar_focused_alt"> <!-- titlebar for attached modal dialogs -->
+<draw_ops name="titlebar_focused_alt"> <!-- titlebar for attached and modal dialogs -->
 	<include name="titlebar_fill_focused_alt2" />
-	<include name="hilight" />
 </draw_ops>
 
 <draw_ops name="rounded_titlebar_focused">
@@ -1115,11 +1119,11 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="modal_dialog_focused" geometry="nobuttons">
+<frame_style name="modal_dialog_focused" geometry="modal">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused_alt" />
+	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
 	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
+	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
 	<button function="maximize" state="normal" draw_ops="maximize_focused" />
@@ -1156,11 +1160,11 @@
 	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="modal_dialog_unfocused" geometry="nobuttons">
+<frame_style name="modal_dialog_unfocused" geometry="modal">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
 	<piece position="titlebar" draw_ops="titlebar_unfocused" />
 	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
+	<piece position="overlay" draw_ops="border_unfocused" />
 	<button function="close" state="normal" draw_ops="close_unfocused"/>
 	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
 	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>