diff options
Diffstat (limited to 'desktop-themes/Aldabra/metacity-1')
| -rw-r--r-- | desktop-themes/Aldabra/metacity-1/metacity-theme-2.xml | 8 | ||||
| -rw-r--r-- | desktop-themes/Aldabra/metacity-1/metacity-theme-3.xml | 120 |
2 files changed, 57 insertions, 71 deletions
diff --git a/desktop-themes/Aldabra/metacity-1/metacity-theme-2.xml b/desktop-themes/Aldabra/metacity-1/metacity-theme-2.xml index 4feb8116..a1ede176 100644 --- a/desktop-themes/Aldabra/metacity-1/metacity-theme-2.xml +++ b/desktop-themes/Aldabra/metacity-1/metacity-theme-2.xml @@ -35,8 +35,8 @@ <distance name="left_titlebar_edge" value="0"/> <distance name="right_titlebar_edge" value="0"/> <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"/> + <border name="title_border" left="10" right="10" top="1" bottom="2"/> + <border name="button_border" left="0" right="0" top="1" bottom="2"/> <aspect_ratio name="button" value="1"/> </frame_geometry> @@ -54,8 +54,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="1"/> - <border name="button_border" left="0" right="0" top="0" bottom="3"/> + <border name="title_border" left="10" right="10" top="1" bottom="2"/> + <border name="button_border" left="0" right="0" top="0" bottom="2"/> <distance name="bottom_height" value="0" /> </frame_geometry> diff --git a/desktop-themes/Aldabra/metacity-1/metacity-theme-3.xml b/desktop-themes/Aldabra/metacity-1/metacity-theme-3.xml index 7b7dcaf9..b4aa3f90 100644 --- a/desktop-themes/Aldabra/metacity-1/metacity-theme-3.xml +++ b/desktop-themes/Aldabra/metacity-1/metacity-theme-3.xml @@ -10,19 +10,19 @@ <!-- meaningfull constants --> -<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.6" /> +<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.7" /> <constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" /> -<constant name="C_border_attached_focused" value="blend/#000000/gtk:bg[NORMAL]/0.4" /> -<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" /> +<constant name="C_border_attached_focused" value="blend/#000000/gtk:bg[NORMAL]/0.7" /> +<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" /> <constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" /> <constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" /> -<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" /> +<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" /> <constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" /> <!-- color of the button icons --> <constant name="C_icons_focused" value="gtk:text[SELECTED]" /> <constant name="C_icons_focused_pressed" value="#ffffff" /> <constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" /> -<constant name="C_icons_unfocused_prelight" value="gtk:bg[NORMAL]" /> +<constant name="C_icons_unfocused_prelight" value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.3" /> <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 --> @@ -35,9 +35,9 @@ <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="10"/> - <border name="title_border" left="10" right="10" top="1" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <distance name="title_vertical_pad" value="9"/> + <border name="title_border" left="10" right="10" top="0" bottom="2"/> + <border name="button_border" left="0" right="0" top="0" bottom="2"/> <aspect_ratio name="button" value="1"/> </frame_geometry> @@ -51,12 +51,12 @@ <distance name="right_width" value="0" /> <distance name="left_titlebar_edge" value="0"/> <distance name="right_titlebar_edge" value="0"/> - <distance name="title_vertical_pad" value="9"/> <!-- + <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="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <border name="title_border" left="10" right="10" top="1" bottom="2"/> + <border name="button_border" left="0" right="0" top="0" bottom="2"/> <distance name="bottom_height" value="0" /> </frame_geometry> @@ -148,27 +148,17 @@ <draw_ops name="titlebar_fill_focused"> <gradient type="vertical" x="0" y="0" width="width" height="height"> - <color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" /> - <color value="gtk:bg[NORMAL]"/> - <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> - <color value="blend/gtk:bg[NORMAL]/#000000/0.06" /> + <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])" /> </gradient> </draw_ops> -<draw_ops name="titlebar_fill_focused_alt"> - <gradient type="vertical" x="0" y="0" width="width" height="height"> - <color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" /> - <!-- <color value="gtk:bg[NORMAL]"/> --> - <!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> --> - <color value="gtk:bg[NORMAL]"/> - </gradient> -</draw_ops> -<draw_ops name="titlebar_fill_focused_alt2"> <!-- gradient for attached and modal dialogs titlebar--> +<draw_ops name="titlebar_fill_attached_focused"> <!-- 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]/gtk:base[NORMAL]/0.4" /> - <color value="gtk:bg[NORMAL]" /> + <color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" /> + <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])" /> </gradient> </draw_ops> @@ -176,11 +166,6 @@ <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> -<draw_ops name="titlebar_unfocused"> - <include name="titlebar_fill_unfocused" /> - <line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_icons_unfocused" /> -</draw_ops> - <draw_ops name="hilight"> <line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" /> <gradient type="vertical" x="1" y="1" width="1" height="height-4"> @@ -200,26 +185,21 @@ </draw_ops> <draw_ops name="titlebar_focused"> - <include name="titlebar_fill_focused_alt" /> + <include name="titlebar_fill_focused" /> <include name="hilight" /> </draw_ops> -<draw_ops name="titlebar_focused_alt"> - <include name="titlebar_fill_focused_alt" /> - <include name="hilight" /> -</draw_ops> - -<draw_ops name="titlebar_focused_alt2"> <!-- titlebar for attached and modal dialogs --> - <include name="titlebar_fill_focused_alt2" /> +<draw_ops name="titlebar_attached_focused"> <!-- titlebar for attached and modal dialogs --> + <include name="titlebar_fill_attached_focused" /> </draw_ops> <draw_ops name="rounded_titlebar_focused"> - <include name="titlebar_fill_focused_alt" /> + <include name="titlebar_fill_focused" /> <include name="rounded_hilight" /> </draw_ops> <draw_ops name="rounded_titlebar_focused_alt"> - <include name="titlebar_fill_focused_alt" /> + <include name="titlebar_fill_focused" /> <include name="rounded_hilight" /> </draw_ops> @@ -235,13 +215,19 @@ <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> <line x1="0" y1="0" x2="width" y2="0" color="C_border_attached_focused" /> <gradient type="vertical" x="0" y="0" width="1" height="top_height"> - <color value="C_border_attached_focused" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.3" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.1" /> <color value="blend/gtk:bg[NORMAL]/#000000/0.1" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.2" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.2" /> <color value="C_border_focused" /> </gradient> <gradient type="vertical" x="width-1" y="0" width="1" height="top_height"> - <color value="C_border_attached_focused" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.3" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.1" /> <color value="blend/gtk:bg[NORMAL]/#000000/0.1" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.2" /> + <color value="blend/gtk:bg[NORMAL]/#000000/0.2" /> <color value="C_border_focused" /> </gradient> </draw_ops> @@ -804,14 +790,14 @@ <!-- button backgrounds --> <constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" /> -<constant name="C_button_hilight" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6" /> +<constant name="C_button_hilight" value="gtk:custom(wm_highlight,blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.6)" /> <draw_ops name="button_fill"> <!-- button background gradient --> <gradient type="vertical" x="0" y="0" width="width" height="height-2"> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.15" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.21" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.27" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.12" /> + <color value="gtk:custom(wm_button_bg_a,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.15)" /> + <color value="gtk:custom(wm_button_bg_b,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.21)" /> + <color value="gtk:custom(wm_button_bg_c,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.27)" /> + <color value="gtk:custom(wm_button_bg_d,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.12)" /> </gradient> </draw_ops> @@ -833,18 +819,18 @@ <draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status --> <gradient type="vertical" x="0" y="0" width="width" height="height-2"> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.2" /> - <color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.04" /> + <color value="gtk:custom(wm_button_bg_hover_a,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03)" /> + <color value="gtk:custom(wm_button_bg_hover_b,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1)" /> + <color value="gtk:custom(wm_button_bg_hover_c,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.2)" /> + <color value="gtk:custom(wm_button_bg_hover_d,blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.04)" /> </gradient> </draw_ops> <draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status --> <gradient type="vertical" x="0" y="0" width="width" height="height-2"> - <color value="C_border_focused" /> - <color value="blend/#000000/gtk:bg[NORMAL]/0.75" /> - <color value="blend/#000000/gtk:bg[NORMAL]/0.8" /> + <color value="gtk:custom(wm_button_bg_active_a,blend/#000000/gtk:bg[NORMAL]/0.7)" /> + <color value="gtk:custom(wm_button_bg_active_b,blend/#000000/gtk:bg[NORMAL]/0.75)" /> + <color value="gtk:custom(wm_button_bg_active_c,blend/#000000/gtk:bg[NORMAL]/0.8)" /> </gradient> </draw_ops> @@ -1156,7 +1142,7 @@ <frame_style name="normal_max_focused" geometry="max"> <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> <piece position="title" draw_ops="title_focused" /> <button function="close" state="normal" draw_ops="close_focused" /> <button function="close" state="pressed" draw_ops="close_focused_pressed" /> @@ -1236,7 +1222,7 @@ <frame_style name="normal_max_shaded_focused" geometry="max"> <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> <piece position="title" draw_ops="title_focused" /> <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece> <button function="close" state="normal" draw_ops="close_focused" /> @@ -1318,7 +1304,7 @@ <frame_style name="dialog_focused" geometry="nobuttons"> <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="rounded_titlebar_focused_alt" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> <piece position="title" draw_ops="title_focused" /> <piece position="overlay" draw_ops="rounded_border_focused" /> <button function="close" state="normal" draw_ops="close_focused" /> @@ -1367,7 +1353,7 @@ <frame_style name="dialog_unfocused" geometry="nobuttons"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="rounded_border_unfocused" /> <button function="close" state="normal" draw_ops="close_unfocused"/> @@ -1398,7 +1384,7 @@ <frame_style name="modal_dialog_focused" geometry="modal"> <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_focused_alt2" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> <piece position="title" draw_ops="title_focused" /> <piece position="overlay" draw_ops="border_focused" /> <button function="close" state="normal" draw_ops="close_focused" /> @@ -1446,7 +1432,7 @@ <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="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="border_unfocused" /> <button function="close" state="normal" draw_ops="close_unfocused"/> @@ -1479,7 +1465,7 @@ <frame_style name="utility_focused" geometry="small"> <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_focused_alt" /> + <piece position="titlebar" draw_ops="titlebar_focused" /> <piece position="title" draw_ops="title_focused" /> <piece position="overlay" draw_ops="border_focused" /> <button function="close" state="normal" draw_ops="close_focused" /> @@ -1530,7 +1516,7 @@ <frame_style name="utility_unfocused" geometry="small_unfocused"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="border_unfocused" /> <button function="close" state="normal" draw_ops="close_unfocused"/> @@ -1613,7 +1599,7 @@ <frame_style name="attached_focused" geometry="attached"> <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_focused_alt2" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> <piece position="overlay" draw_ops="border_attached_focused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> @@ -1664,7 +1650,7 @@ <frame_style name="tiled_left_focused" geometry="tiled_left"> <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> <piece position="title" draw_ops="title_focused" /> <piece position="overlay" draw_ops="border_right_focused" /> <button function="close" state="normal" draw_ops="close_focused" /> @@ -1746,7 +1732,7 @@ <frame_style name="tiled_right_focused" geometry="tiled_right"> <piece position="entire_background" draw_ops="entire_background_focused" /> - <piece position="titlebar" draw_ops="titlebar_fill_focused_alt" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> <piece position="title" draw_ops="title_focused" /> <piece position="overlay" draw_ops="border_left_focused" /> <button function="close" state="normal" draw_ops="close_focused" /> |