diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index 095022e..d115c7f 100644 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -51,11 +51,11 @@ @define-color osd_bg alpha(@osd_base, 0.8); /* window manager colors */ -@define-color wm_bg @theme_bg_color; -@define-color wm_title_focused mix(@theme_fg_color, @theme_bg_color, 0.1); -@define-color wm_title_unfocused mix(@theme_fg_color, @theme_bg_color, 0.6); -@define-color wm_border_focused shade(@theme_bg_color, 0.7); -@define-color wm_border_unfocused shade(@theme_bg_color, 0.8); +@define-color wm_bg #2d2d2d; +@define-color wm_title_focused #dcdcdc; +@define-color wm_title_unfocused #888888; +@define-color wm_border_focused #2d2d2d; +@define-color wm_border_unfocused #2d2d2d; @import url("gtk-widgets.css"); @import url("gtk-widgets-assets.css"); diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 611f8e4..26d1d37 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -51,11 +51,11 @@ @define-color osd_bg alpha(@osd_base, 0.8); /* window manager colors */ -@define-color wm_bg @theme_bg_color; -@define-color wm_title_focused mix(@theme_fg_color, @theme_bg_color, 0.1); -@define-color wm_title_unfocused mix(@theme_fg_color, @theme_bg_color, 0.6); -@define-color wm_border_focused shade(@theme_bg_color, 0.7); -@define-color wm_border_unfocused shade(@theme_bg_color, 0.8); +@define-color wm_bg #2d2d2d; +@define-color wm_title_focused #dcdcdc; +@define-color wm_title_unfocused #888888; +@define-color wm_border_focused #2d2d2d; +@define-color wm_border_unfocused #2d2d2d; @import url("gtk-widgets.css"); @import url("gtk-widgets-assets.css"); diff --git a/metacity-1/close_unfocused_prelight.png b/metacity-1/close_unfocused_prelight.png deleted file mode 100644 index 980a80e..0000000 Binary files a/metacity-1/close_unfocused_prelight.png and /dev/null differ diff --git a/metacity-1/close_unfocused_pressed.png b/metacity-1/close_unfocused_pressed.png deleted file mode 100644 index 7e20728..0000000 Binary files a/metacity-1/close_unfocused_pressed.png and /dev/null differ diff --git a/metacity-1/maximize_unfocused_prelight.png b/metacity-1/maximize_unfocused_prelight.png deleted file mode 100644 index 3a51c72..0000000 Binary files a/metacity-1/maximize_unfocused_prelight.png and /dev/null differ diff --git a/metacity-1/maximize_unfocused_pressed.png b/metacity-1/maximize_unfocused_pressed.png deleted file mode 100644 index 2b4dad5..0000000 Binary files a/metacity-1/maximize_unfocused_pressed.png and /dev/null differ diff --git a/metacity-1/menu-pressed.png b/metacity-1/menu-pressed.png deleted file mode 100644 index 866363b..0000000 Binary files a/metacity-1/menu-pressed.png and /dev/null differ diff --git a/metacity-1/menu-unfocus.png b/metacity-1/menu-unfocus.png deleted file mode 100644 index 015d855..0000000 Binary files a/metacity-1/menu-unfocus.png and /dev/null differ diff --git a/metacity-1/menu.png b/metacity-1/menu.png deleted file mode 100644 index 1e9d3db..0000000 Binary files a/metacity-1/menu.png and /dev/null differ diff --git a/metacity-1/menu_prelight.png b/metacity-1/menu_prelight.png deleted file mode 100644 index 82a2077..0000000 Binary files a/metacity-1/menu_prelight.png and /dev/null differ diff --git a/metacity-1/metacity-theme-1.xml b/metacity-1/metacity-theme-1.xml index 10ec7c6..9ada814 100644 --- a/metacity-1/metacity-theme-1.xml +++ b/metacity-1/metacity-theme-1.xml @@ -1,461 +1,392 @@ - - Siva - nale12 - GPL - 2013 - Metacity theme + Numix + Satyajit Sahoo + GPL-3.0+ + 8 March 2013 + Numix Metacity Theme - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + - + + + + + + + + - - - - - - - - - - - - - + + + + - - + + + + + + + + + + + + - - +<!-- button minimum size --> +<constant name="Bmin" value="7"/> +<!-- button inside padding --> +<constant name="Bpad" value="6"/> + +<!-- ::: CORNERS OUTLINE::: --> +<draw_ops name="corners_outline"> </draw_ops> -<draw_ops name="draw_title_text_inactive"> - <title color="#888888" x="3 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/> -</draw_ops> - -<draw_ops name="draw_title"> - <!-- Background gradient --> - <rectangle color="#2D2D2D" x="0" y="0" width="width" height="height" filled="true" /> - -</draw_ops> - -<draw_ops name="draw_title_unfocused"> - <rectangle color="#2D2D2D" x="0" y="0" width="width" height="height" filled="true" /> - -</draw_ops> - -<draw_ops name="draw_title_inactive"> - <include name="draw_title_unfocused" /> -</draw_ops> - -<draw_ops name="draw_title_maximized"> - <!-- Background gradient --> - <rectangle color="#2D2D2D" x="0" y="0" width="width" height="height" filled="true" /> - -</draw_ops> -<draw_ops name="draw_title_maximized_unfocused"> - <!-- Background gradient --> - <rectangle color="#2D2D2D" x="0" y="0" width="width" height="height" filled="true" /> - -</draw_ops> - -<draw_ops name="draw_title_maximized_inactive"> - <include name="draw_title_maximized_unfocused" /> -</draw_ops> - -<!-- Window Frames --> - -<draw_ops name="draw_frame"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> -<draw_ops name="draw_frame_unfocused"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> -<!-- bottom border --> -<draw_ops name="bottom"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> - -</draw_ops> -<draw_ops name="bottom_edge"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> - -</draw_ops> -<draw_ops name="bottom-inactive"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> - -</draw_ops> - +<!-- ::: BORDER OUTLINE ::: --> <draw_ops name="border"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width-1" height="height-1" filled="true" /> + <line color="#2d2d2d" x1="0" y1="0" x2="width" y2="0"/> + <line color="#2d2d2d" x1="4" y1="1" x2="width-1" y2="1"/> + <line color="#2d2d2d" x1="0" y1="0" x2="0" y2="height"/> + <line color="#2d2d2d" x1="width-1" y1="0" x2="width-1" y2="height"/> + <line color="#2d2d2d" x1="0" y1="height-1" x2="width" y2="height-1"/> </draw_ops> -<!-- BUTTONS --> +<draw_ops name="maxed_border"> + <line color="#2d2d2d" x1="0" y1="0" x2="width" y2="0"/> + <line color="#2d2d2d" x1="0" y1="height-1" x2="width" y2="height-1"/> +</draw_ops> -<!-- Button Trough Left --> - <draw_ops name="left_left_background_focused_normal"> - <image filename="trough_left.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_left_background_focused_pressed"> - <image filename="trough_left.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_middle_background_focused_normal"> - <image filename="trough_middle.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_middle_background_focused_pressed"> - <image filename="trough_middle.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_right_background_focused_normal"> - <image filename="trough_right.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_right_background_focused_pressed"> - <image filename="trough_right.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_left_background_unfocused_normal"> - <image filename="trough_left.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_left_background_unfocused_pressed"> - <image filename="trough_left.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_middle_background_unfocused_normal"> - <image filename="trough_middle.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_middle_background_unfocused_pressed"> - <image filename="trough_middle.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_right_background_unfocused_normal"> - <image filename="trough_right.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="left_right_background_unfocused_pressed"> - <image filename="trough_right.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - -<!-- Button Trough Right --> - <draw_ops name="right_left_background_focused_normal"> - <image filename="trough_left.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_left_background_focused_pressed"> - <image filename="trough_left.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_middle_background_focused_normal"> - <image filename="trough_middle.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_middle_background_focused_pressed"> - <image filename="trough_middle.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_right_background_focused_normal"> - <image filename="trough_right.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_right_background_focused_pressed"> - <image filename="trough_right.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_left_background_unfocused_normal"> - <image filename="trough_left.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_left_background_unfocused_pressed"> - <image filename="trough_left.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_middle_background_unfocused_normal"> - <image filename="trough_middle.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_middle_background_unfocused_pressed"> - <image filename="trough_middle.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_right_background_unfocused_normal"> - <image filename="trough_right.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="right_right_background_unfocused_pressed"> - <image filename="trough_right.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - -<!-- Button prelightlays --> - <draw_ops name="menu_focused_normal"> - <image filename="menu.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="menu_focused_prelight"> - <image filename="menu_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="menu_unfocused_normal"> - <image filename="menu-unfocus.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="menu_unfocused_prelight"> - <image filename="menu_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="minimize_focused_normal"> - <image filename="minimize_focused_normal.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="minimize_focused_prelight"> - <image filename="minimize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="minimize_focused_pressed"> - <image filename="minimize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="minimize_unfocused_normal"> - <image filename="minimize_unfocused.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="minimize_unfocused_prelight"> - <image filename="minimize_unfocused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="minimize_unfocused_pressed"> - <image filename="minimize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="maximize_focused_normal"> - <image filename="maximize_focused_normal.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="maximize_focused_prelight"> - <image filename="maximize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="maximize_focused_pressed"> - <image filename="maximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="maximize_unfocused_normal"> - <image filename="maximize_unfocused.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="maximize_unfocused_prelight"> - <image filename="maximize_unfocused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="maximize_unfocused_pressed"> - <image filename="maximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_focused_normal"> - <image filename="unmaximize_focused_normal.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_focused_prelight"> - <image filename="unmaximize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_focused_pressed"> - <image filename="unmaximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_unfocused_normal"> - <image filename="unmaximize_unfocused.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_unfocused_prelight"> - <image filename="unmaximize_unfocused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_unfocused_pressed"> - <image filename="unmaximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="close_focused_normal"> - <image filename="close_focused_normal.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="close_focused_prelight"> - <image filename="close_focused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="close_focused_pressed"> - <image filename="close_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="close_unfocused_normal"> - <image filename="close_unfocused.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="close_unfocused_prelight"> - <image filename="close_unfocused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="close_unfocused_pressed"> - <image filename="close_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - +<!-- ::: TITLEBAR ::: --> +<draw_ops name="titlebar_gradient"> + <rectangle color="#2d2d2d" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> -<!-- FRAME STYLE --> -<frame_style name="normal_focused" geometry="frame_geometry_normal"> - <piece position="title" draw_ops="draw_title_text_normal"/> - <piece position="titlebar" draw_ops="draw_title"/> - <piece position="left_edge" draw_ops="draw_frame"/> - <piece position="right_edge" draw_ops="draw_frame"/> - <piece position="bottom_edge" draw_ops="bottom_edge"/> - <button function="left_left_background" state="normal" draw_ops="left_left_background_focused_normal"/> - <button function="left_middle_background" state="normal" draw_ops="left_middle_background_focused_normal"/> - <button function="left_right_background" state="normal" draw_ops="left_right_background_focused_normal"/> - <button function="left_left_background" state="prelight" draw_ops="left_left_background_focused_normal"/> - <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_focused_normal"/> - <button function="left_right_background" state="prelight" draw_ops="left_right_background_focused_normal"/> - <button function="left_left_background" state="pressed" draw_ops="left_left_background_focused_pressed"/> - <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_focused_pressed"/> - <button function="left_right_background" state="pressed" draw_ops="left_right_background_focused_pressed"/> - <button function="right_left_background" state="normal" draw_ops="right_left_background_focused_normal"/> - <button function="right_middle_background" state="normal" draw_ops="right_middle_background_focused_normal"/> - <button function="right_right_background" state="normal" draw_ops="right_right_background_focused_normal"/> - <button function="right_left_background" state="prelight" draw_ops="right_left_background_focused_normal"/> - <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_focused_normal"/> - <button function="right_right_background" state="prelight" draw_ops="right_right_background_focused_normal"/> - <button function="right_left_background" state="pressed" draw_ops="right_left_background_focused_pressed"/> - <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_focused_pressed"/> - <button function="right_right_background" state="pressed" draw_ops="right_right_background_focused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_focused_normal"/> - <button function="menu" state="prelight" draw_ops="menu_focused_prelight"/> - <button function="menu" state="pressed" draw_ops="menu_focused_normal"/> - <button function="minimize" state="normal" draw_ops="minimize_focused_normal"/> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_focused_normal"/> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed"/> - <button function="close" state="normal" draw_ops="close_focused_normal"/> - <button function="close" state="prelight" draw_ops="close_focused_prelight"/> - <button function="close" state="pressed" draw_ops="close_focused_pressed"/> +<draw_ops name="titlebar_gradient_unfocused"> + <rectangle color="#2d2d2d" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="titlebar_maximized"> + <include name="titlebar_gradient"/> + <include name="maxed_border"/> +</draw_ops> + +<draw_ops name="titlebar_maximized_unfocused"> + <include name="titlebar_gradient_unfocused"/> + <include name="maxed_border"/> +</draw_ops> + +<draw_ops name="round_titlebar"> + <include name="titlebar_gradient"/> + <include name="border"/> + <include name="corners_outline"/> +</draw_ops> + +<draw_ops name="round_titlebar_unfocused"> + <include name="titlebar_gradient_unfocused"/> + <include name="border"/> + <include name="corners_outline"/> +</draw_ops> + +<draw_ops name="titlebar_shaded"> + <include name="border"/> + <line color="#2d2d2d" x1="0" y1="height-1" x2="width" y2="height-1"/> +</draw_ops> + +<draw_ops name="round_titlebar_shaded"> + <include name="border"/> + <include name="corners_outline"/> + <line color="#2d2d2d" x1="5" y1="height-1" x2="width-6" y2="height-1"/> +</draw_ops> + +<!-- ::: TITLES ::: --> +<draw_ops name="title"> + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="#dcdcdc" /> +</draw_ops> + +<draw_ops name="title_unfocused"> + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="#888888" /> +</draw_ops> + +<!-- ::: BUTTON ICONS ::: --> +<!-- close icon --> +<draw_ops name="close_button_normal"> + <image filename="close_focused_normal.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="close_button_prelight"> + <image filename="close_focused_prelight.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="close_button_pressed"> + <image filename="close_focused_pressed.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="close_button_unfocused"> + <image filename="close_unfocused.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<!-- maximize icon --> +<draw_ops name="maximize_button_normal"> + <image filename="maximize_focused_normal.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="maximize_button_prelight"> + <image filename="maximize_focused_prelight.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="maximize_button_pressed"> + <image filename="maximize_focused_pressed.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="maximize_button_unfocused"> + <image filename="maximize_unfocused.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<!-- unmaximize icon --> +<draw_ops name="unmaximize_button_normal"> + <image filename="unmaximize_focused_normal.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="unmaximize_button_prelight"> + <image filename="unmaximize_focused_prelight.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="unmaximize_button_pressed"> + <image filename="unmaximize_focused_pressed.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="unmaximize_button_unfocused"> + <image filename="unmaximize_unfocused.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<!-- minimize icon --> +<draw_ops name="minimize_button_normal"> + <image filename="minimize_focused_normal.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="minimize_button_prelight"> + <image filename="minimize_focused_prelight.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="minimize_button_pressed"> + <image filename="minimize_focused_pressed.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<draw_ops name="minimize_button_unfocused"> + <image filename="minimize_unfocused.png" + x="(width - object_width) / 2" + y="(height - object_height) / 2" + width="object_width" + height="object_height"/> +</draw_ops> + +<!-- menu icon --> +<draw_ops name="menu_button"></draw_ops> + +<!-- :: BLANK :: --> +<draw_ops name="blank"></draw_ops> + +<!-- ::: FRAME STYLES ::: --> +<frame_style name="normal" geometry="normal"> + <piece position="entire_background" draw_ops="round_titlebar_unfocused"/> + <piece position="title" draw_ops="title_unfocused"/> + <button function="close" state="normal" draw_ops="close_button_unfocused"/> + <button function="close" state="pressed" draw_ops="close_button_pressed"/> + <button function="close" state="prelight" draw_ops="close_button_prelight"/> + <button function="maximize" state="normal" draw_ops="maximize_button_unfocused"/> + <button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/> + <button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/> + <button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/> + <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/> + <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/> + <button function="menu" state="normal" draw_ops="menu_button"/> + <button function="menu" state="pressed" draw_ops="menu_button"/> + <button function="menu" state="prelight" draw_ops="menu_button"/> </frame_style> -<frame_style name="normal_unfocused" geometry="frame_geometry_normal"> - <piece position="title" draw_ops="draw_title_text_inactive"/> - <piece position="titlebar" draw_ops="draw_title_inactive"/> - <piece position="left_edge" draw_ops="draw_frame_unfocused"/> - <piece position="right_edge" draw_ops="draw_frame_unfocused"/> - <piece position="bottom_edge" draw_ops="bottom-inactive"/> - <button function="left_left_background" state="normal" draw_ops="left_left_background_unfocused_normal"/> - <button function="left_middle_background" state="normal" draw_ops="left_middle_background_unfocused_normal"/> - <button function="left_right_background" state="normal" draw_ops="left_right_background_unfocused_normal"/> - <button function="left_left_background" state="prelight" draw_ops="left_left_background_unfocused_normal"/> - <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_unfocused_normal"/> - <button function="left_right_background" state="prelight" draw_ops="left_right_background_unfocused_normal"/> - <button function="left_left_background" state="pressed" draw_ops="left_left_background_unfocused_pressed"/> - <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_unfocused_pressed"/> - <button function="left_right_background" state="pressed" draw_ops="left_right_background_unfocused_pressed"/> - <button function="right_left_background" state="normal" draw_ops="right_left_background_unfocused_normal"/> - <button function="right_middle_background" state="normal" draw_ops="right_middle_background_unfocused_normal"/> - <button function="right_right_background" state="normal" draw_ops="right_right_background_unfocused_normal"/> - <button function="right_left_background" state="prelight" draw_ops="right_left_background_unfocused_normal"/> - <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_unfocused_normal"/> - <button function="right_right_background" state="prelight" draw_ops="right_right_background_unfocused_normal"/> - <button function="right_left_background" state="pressed" draw_ops="right_left_background_unfocused_pressed"/> - <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_unfocused_pressed"/> - <button function="right_right_background" state="pressed" draw_ops="right_right_background_unfocused_pressed"/> - <button function="menu" state="normal" draw_ops="menu_unfocused_normal"/> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/> - <button function="menu" state="pressed" draw_ops="menu_focused_normal"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused_normal"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused_normal"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="close" state="normal" draw_ops="close_unfocused_normal"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> +<frame_style name="normal_shaded" geometry="shaded" parent="normal"> + <piece position="entire_background" draw_ops="round_titlebar"/> </frame_style> -<frame_style name="maximized_focused" geometry="geometry_maximized" parent="normal_focused"> - <piece position="title" draw_ops="draw_title_text_normal"/> - <piece position="titlebar" draw_ops="draw_title_maximized"/> - <button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/> +<frame_style name="focused" geometry="normal" parent="normal"> + <piece position="entire_background" draw_ops="round_titlebar"/> + <piece position="title" draw_ops="title"/> + <button function="close" state="normal" draw_ops="close_button_normal"/> + <button function="close" state="pressed" draw_ops="close_button_pressed"/> + <button function="close" state="prelight" draw_ops="close_button_prelight"/> + <button function="maximize" state="normal" draw_ops="maximize_button_normal"/> + <button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/> + <button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/> + <button function="minimize" state="normal" draw_ops="minimize_button_normal"/> + <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/> + <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/> + <button function="menu" state="normal" draw_ops="menu_button"/> + <button function="menu" state="pressed" draw_ops="menu_button"/> + <button function="menu" state="prelight" draw_ops="menu_button"/> </frame_style> -<frame_style name="maximized_unfocused" geometry="geometry_maximized" parent="normal_unfocused"> - <piece position="title" draw_ops="draw_title_text_inactive"/> - <piece position="titlebar" draw_ops="draw_title_maximized_inactive"/> - <button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/> +<frame_style name="focused_shaded" geometry="shaded" parent="focused"> + <piece position="entire_background" draw_ops="round_titlebar_shaded"/> </frame_style> -<frame_style name="utility_focused" parent="normal_focused"> - <piece position="title" draw_ops="draw_title_text_normal"/> - <piece position="titlebar" draw_ops="draw_title"/> - <button function="menu" state="normal" draw_ops="menu_focused_normal"/> - <button function="menu" state="prelight" draw_ops="menu_focused_prelight"/> - <button function="menu" state="pressed" draw_ops="menu_focused_normal"/> - <button function="close" state="normal" draw_ops="close_focused_normal"/> - <button function="close" state="prelight" draw_ops="close_focused_prelight"/> - <button function="close" state="pressed" draw_ops="close_focused_pressed"/> +<frame_style name="normal_maximized" geometry="normal_maximized" parent="normal"> + <piece position="entire_background" draw_ops="titlebar_maximized_unfocused"/> + <button function="maximize" state="normal" draw_ops="unmaximize_button_unfocused"/> + <button function="maximize" state="pressed" draw_ops="unmaximize_button_pressed"/> + <button function="maximize" state="prelight" draw_ops="unmaximize_button_prelight"/> </frame_style> -<frame_style name="utility_unfocused" parent="normal_unfocused"> - <piece position="title" draw_ops="draw_title_text_inactive"/> - <piece position="titlebar" draw_ops="draw_title_inactive"/> - <button function="menu" state="normal" draw_ops="menu_unfocused_normal"/> - <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/> - <button function="menu" state="pressed" draw_ops="menu_focused_normal"/> - <button function="close" state="normal" draw_ops="close_unfocused_normal"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> +<frame_style name="focused_maximized" geometry="normal_maximized" parent="focused"> + <piece position="entire_background" draw_ops="titlebar_maximized"/> + <button function="maximize" state="normal" draw_ops="unmaximize_button_normal"/> + <button function="maximize" state="pressed" draw_ops="unmaximize_button_pressed"/> + <button function="maximize" state="prelight" draw_ops="unmaximize_button_prelight"/> </frame_style> -<frame_style name="border" geometry="border" > - <piece position="overlay" draw_ops="border"/> - <button function="close" state="normal"><draw_ops></draw_ops></button> - <button function="close" state="pressed"><draw_ops></draw_ops></button> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> +<frame_style name="border" geometry="border" parent="normal"> + <piece position="entire_background" draw_ops="border"/> + <piece position="title" draw_ops="blank"/> +</frame_style> + +<frame_style name="utility_normal" geometry="utility" parent="normal"></frame_style> + +<frame_style name="utility_focused" geometry="utility" parent="focused"></frame_style> + +<frame_style name="utility_focused_shaded" geometry="utility" parent="focused_shaded"> + <piece position="entire_background" draw_ops="titlebar_shaded"/> </frame_style> -<!-- STYLE SET --> <frame_style_set name="normal"> - <frame focus="yes" state="normal" resize="both" style="normal_focused"/> - <frame focus="no" state="normal" resize="both" style="normal_unfocused"/> - <frame focus="yes" state="maximized" style="maximized_focused"/> - <frame focus="no" state="maximized" style="maximized_unfocused"/> - <frame focus="yes" state="shaded" style="normal_focused"/><!-- todo --> - <frame focus="no" state="shaded" style="normal_unfocused"/><!-- todo --> - <frame focus="yes" state="maximized_and_shaded" style="maximized_focused"/><!-- todo --> - <frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/><!-- todo --> + <frame focus="yes" state="normal" resize="both" style="focused"/> + <frame focus="no" state="normal" resize="both" style="normal"/> + <frame focus="yes" state="maximized" style="focused_maximized"/> + <frame focus="no" state="maximized" style="normal_maximized"/> + <frame focus="yes" state="shaded" style="focused_shaded"/> + <frame focus="no" state="shaded" style="normal_shaded"/> + <frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/> + <frame focus="no" state="maximized_and_shaded" style="normal_maximized"/> </frame_style_set> -<frame_style_set name="utility"> +<frame_style_set name="utility" parent="normal"> <frame focus="yes" state="normal" resize="both" style="utility_focused"/> - <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> - <frame focus="yes" state="maximized" style="maximized_focused"/> - <frame focus="no" state="maximized" style="normal_focused"/> - <frame focus="yes" state="shaded" style="normal_focused"/><!-- todo --> - <frame focus="no" state="shaded" style="normal_unfocused"/><!-- todo --> - <frame focus="yes" state="maximized_and_shaded" style="maximized_focused"/><!-- todo --> - <frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/><!-- todo --> + <frame focus="no" state="normal" resize="both" style="utility_normal"/> + <!-- this is a bunch of crap since utility windows shouldn't be maximized --> + <frame focus="yes" state="maximized" style="focused"/> + <frame focus="no" state="maximized" style="normal"/> + <frame focus="yes" state="shaded" style="utility_focused_shaded"/> + <frame focus="no" state="shaded" style="utility_normal"/> + <frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/> + <frame focus="no" state="maximized_and_shaded" style="normal"/> </frame_style_set> <frame_style_set name="border"> <frame focus="yes" state="normal" resize="both" style="border"/> <frame focus="no" state="normal" resize="both" style="border"/> - <frame focus="yes" state="maximized" style="maximized_focused"/> - <frame focus="no" state="maximized" style="normal_focused"/> - <frame focus="yes" state="shaded" style="normal_focused"/><!-- todo --> - <frame focus="no" state="shaded" style="normal_unfocused"/><!-- todo --> - <frame focus="yes" state="maximized_and_shaded" style="maximized_focused"/><!-- todo --> - <frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/><!-- todo --> + <frame focus="yes" state="maximized" style="border"/> + <frame focus="no" state="maximized" style="border"/> + <frame focus="yes" state="shaded" style="border"/> + <frame focus="no" state="shaded" style="border"/> + <frame focus="yes" state="maximized_and_shaded" style="border"/> + <frame focus="no" state="maximized_and_shaded" style="border"/> </frame_style_set> -<!-- WINDOW --> +<menu_icon function="close" state="normal" draw_ops="close_button_icon_unfocused"/> +<menu_icon function="maximize" state="normal" draw_ops="maximize_button_icon_unfocused"/> +<menu_icon function="unmaximize" state="normal" draw_ops="maximize_button_icon_unfocused"/> +<menu_icon function="minimize" state="normal" draw_ops="minimize_button_icon_unfocused"/> + +<!-- ::: WINDOWS ::: --> <window type="normal" style_set="normal"/> -<window type="dialog" style_set="utility"/> -<window type="modal_dialog" style_set="utility"/> -<window type="menu" style_set="utility"/> +<window type="dialog" style_set="normal"/> +<window type="modal_dialog" style_set="normal"/> +<window type="menu" style_set="normal"/> <window type="utility" style_set="utility"/> <window type="border" style_set="border"/> -</metacity_theme> +</metacity_theme> diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml index 6a2c99c..1071d58 100644 --- a/metacity-1/metacity-theme-3.xml +++ b/metacity-1/metacity-theme-3.xml @@ -1,413 +1,362 @@ <?xml version="1.0"?> <metacity_theme> <info> - <name>Siva</name> - <author>nale12</author> - <copyright>GPL</copyright> - <date>2013</date> - <description>Siva GNOME 3 window theme</description> + <name>Numix</name> + <author>Satyajit Sahoo</author> + <copyright>GPL-3.0+</copyright> + <date>8 March 2013</date> + <description>Numix Mutter Theme</description> </info> -<!-- meaningfull constants --> +<!-- ::: CONSTANTS ::: --> +<constant name="C_border_focused" value="gtk:custom(wm_border_focused,shade/gtk:bg[NORMAL]/0.7)" /> +<constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,shade/gtk:bg[NORMAL]/0.8)" /> +<constant name="C_title_focused" value="gtk:custom(wm_title_focused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1)" /> +<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6)" /> -<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons --> -<!-- geometries --> - -<frame_geometry name="normal" title_scale="medium"> - <distance name="left_width" value="0" /> - <distance name="right_width" value="0" /> - <distance name="bottom_height" value="0" /> - <distance name="left_titlebar_edge" value="2"/> - <distance name="right_titlebar_edge" value="2"/> - <distance name="button_width" value="24"/> - <distance name="button_height" value="24"/> - <distance name="title_vertical_pad" value="8"/> - <border name="title_border" left="10" right="10" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> +<!-- ::: GEOMETRY ::: --> +<frame_geometry name="normal" title_scale="medium" rounded_top_left="2" rounded_top_right="2"> + <distance name="left_width" value="1" /> + <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="0" /> + <aspect_ratio name="button" value="1.0" /> + <border name="title_border" left="10" right="10" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> -<frame_geometry name="normal_unfocused" title_scale="medium" parent="normal"> - <distance name="left_titlebar_edge" value="2"/> - <distance name="right_titlebar_edge" value="2"/> -</frame_geometry> +<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="2" rounded_top_right="2" parent="normal" /> -<frame_geometry name="max" title_scale="medium" parent="normal"> +<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false"> <distance name="left_width" value="0" /> <distance name="right_width" value="0" /> - <distance name="left_titlebar_edge" value="2"/> - <distance name="right_titlebar_edge" value="2"/> - <distance name="button_width" value="24"/> - <distance name="button_height" value="24"/> - <distance name="title_vertical_pad" value="7"/> <!-- - 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="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> <distance name="bottom_height" value="0" /> </frame_geometry> <frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> - <distance name="right_width" value="0" /> + <distance name="right_width" value="1" /> </frame_geometry> <frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> - <distance name="left_width" value="0" /> + <distance name="left_width" value="1" /> </frame_geometry> <frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <distance name="title_vertical_pad" value="5"/> - <border name="title_border" left="10" right="10" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <distance name="title_vertical_pad" value="2" /> + <border name="title_border" left="10" right="10" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> -<frame_geometry name="small_unfocused" parent="small"> - <distance name="left_titlebar_edge" value="2"/> - <distance name="right_titlebar_edge" value="2"/> -</frame_geometry> +<frame_geometry name="small_unfocused" parent="small" /> -<frame_geometry name="nobuttons" hide_buttons="true" parent="normal"> -</frame_geometry> +<frame_geometry name="nobuttons" hide_buttons="true" parent="normal" /> -<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > +<frame_geometry name="border" 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" /> - <border name="title_border" left="10" right="10" top="0" bottom="0" /> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> - <distance name="title_vertical_pad" value="1" /> + <distance name="title_vertical_pad" value="0" /> </frame_geometry> -<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 name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal"> + <distance name="left_width" value="0" /> + <distance name="right_width" value="0" /> + <distance name="bottom_height" value="0" /> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="2" rounded_top_right="2" rounded_bottom_right="2" rounded_bottom_left="2" parent="small"> + <distance name="title_vertical_pad" value="0" /> </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"/> + <distance name="title_vertical_pad" value="0" /> </frame_geometry> -<!-- drawing operations --> - - <!-- title --> - +<!-- ::: TITLES ::: --> <draw_ops name="title_focused"> - <title color="#dcdcdc" x="3 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/> + <title version="< 3.1" + x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="C_title_focused" /> + <title version=">= 3.1" + x="(0 `max` ((frame_x_center - title_width/2) `min` (width - title_width))) + 2" + y="(0 `max` ((height - title_height) / 2))" + ellipsize_width="width" + color="C_title_focused" /> </draw_ops> <draw_ops name="title_unfocused"> - <title color="#888888" x="3 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/> + <title version="< 3.1" + x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="C_title_unfocused" /> + <title version=">= 3.1" + x="(0 `max` ((frame_x_center - title_width/2) `min` (width - title_width))) + 2" + y="(0 `max` ((height - title_height) / 2))" + ellipsize_width="width" + color="C_title_unfocused" /> </draw_ops> - <!-- window decorations --> - +<!-- ::: WINDOW DECORATIONS ::: --> <draw_ops name="entire_background_focused"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> + <rectangle color="gtk:custom(wm_bg,gtk:bg[NORMAL])" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> <draw_ops name="entire_background_unfocused"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> + <include name="entire_background_focused" /> </draw_ops> <draw_ops name="titlebar_fill_focused"> - <!-- Background gradient --> - <rectangle color="#2D2D2D" x="0" y="0" width="width" height="height" filled="true" /> + <rectangle color="gtk:custom(wm_bg,gtk:bg[NORMAL])" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> - -<draw_ops name="titlebar_fill_attached_focused"> <!-- gradient for attached and modal dialogs titlebar--> - <!-- Background gradient --> - <rectangle color="#2D2D2D" x="0" y="0" width="width" height="height" filled="true" /> +<draw_ops name="titlebar_fill_attached_focused"> + <include name="entire_background_focused" /> </draw_ops> <draw_ops name="titlebar_fill_unfocused"> - <rectangle color="#2D2D2D" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> -<draw_ops name="bottom"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> -<draw_ops name="bottom-inactive"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> - -<draw_ops name="hilight"> - -</draw_ops> - -<draw_ops name="rounded_hilight"> - + <rectangle color="gtk:custom(wm_bg,gtk:bg[NORMAL])" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> <draw_ops name="titlebar_focused"> <include name="titlebar_fill_focused" /> - <include name="hilight" /> </draw_ops> <draw_ops name="titlebar_attached_focused"> <!-- titlebar for attached and modal dialogs --> <include name="titlebar_fill_attached_focused" /> </draw_ops> -<draw_ops name="titlebar_attached_unfocused"> <!-- titlebar for attached and modal dialogs --> - <include name="titlebar_fill_unfocused" /> -</draw_ops> + <draw_ops name="rounded_titlebar_focused"> <include name="titlebar_fill_focused" /> - <include name="rounded_hilight" /> -</draw_ops> -<draw_ops name="rounded_titlebar_unfocused"> - <include name="titlebar_fill_unfocused" /> - <include name="rounded_hilight" /> -</draw_ops> -<draw_ops name="rounded_titlebar_focused_alt"> - <include name="titlebar_fill_focused" /> - <include name="rounded_hilight" /> </draw_ops> <draw_ops name="border_focused"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width-1" height="height-1" filled="true" /> + <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> </draw_ops> <draw_ops name="border_unfocused"> - <rectangle color="blend/gtk:bg[NORMAL]/#000000/0.1" x="0" y="0" width="width-1" height="height-1" filled="true" /> + <rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" /> </draw_ops> +<draw_ops name="rounded_border_focused"> + <line color="C_border_focused" x1="2" y1="0" x2="width-3" y2="0" /> + <line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_focused" x1="0" y1="2" x2="0" y2="height-2" /> + <line color="C_border_focused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> + <arc color="C_border_focused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_focused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="rounded_border_unfocused"> + <line color="C_border_unfocused" x1="2" y1="0" x2="width-3" y2="0" /> + <line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_unfocused" x1="0" y1="2" x2="0" y2="height-2" /> + <line color="C_border_unfocused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> + <arc color="C_border_unfocused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_unfocused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" /> +</draw_ops> <draw_ops name="border_right_focused"> - + <line + x1="width-1" y1="0" + x2="width-1" y2="height" + color="C_border_focused" /> </draw_ops> <draw_ops name="border_right_unfocused"> - + <line + x1="width-1" y1="0" + x2="width-1" y2="height" + color="C_border_unfocused" /> </draw_ops> <draw_ops name="border_left_focused"> - + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_focused" /> </draw_ops> <draw_ops name="border_left_unfocused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_unfocused" /> +</draw_ops> -</draw_ops> -<draw_ops name="draw_frame"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> -<draw_ops name="draw_frame_unfocus"> - <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> -<!-- button icons--> - +<!-- ::: BUTTON ICONS ::: --> <!-- note: negative values in x or y causes gnome-shell to crash --> -<draw_ops name="close_glyph_focused"> - <image filename="close_focused_normal.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - +<!-- close icon --> <draw_ops name="close_focused"> - <include name="close_glyph_focused" /> + <image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_focused_prelight"> - <image filename="close_focused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_focused_pressed"> - <image filename="close_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - -<draw_ops name="close_glyph_unfocused"> - <image filename="close_unfocused.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_unfocused"> - <include name="close_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="close_glyph_unfocused_prelight"> - <image filename="close_unfocused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_unfocused_prelight"> - <include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="close_glyph_unfocused_pressed"> - <image filename="close_unfocused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> + <include name="close_focused_prelight" /> </draw_ops> <draw_ops name="close_unfocused_pressed"> - <include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="maximize_glyph_focused"> - <image filename="maximize_focused_normal.png" x="0" y="0" width="object_width" height="object_height"/> + <include name="close_focused_pressed" /> </draw_ops> +<!-- maximize icon --> <draw_ops name="maximize_focused"> - <include name="maximize_glyph_focused" /> + <image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_focused_prelight"> - <image filename="maximize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_focused_pressed"> - <image filename="maximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_glyph_unfocused"> - <image filename="maximize_unfocused.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_unfocused"> - <include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="maximize_glyph_unfocused_prelight"> - <image filename="maximize_unfocused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_unfocused_prelight"> - <include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="maximize_glyph_unfocused_pressed"> - <image filename="maximize_unfocused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> + <include name="maximize_focused_prelight" /> </draw_ops> <draw_ops name="maximize_unfocused_pressed"> - <include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> + <include name="maximize_focused_pressed" /> </draw_ops> -<draw_ops name="minimize_glyph_focused"> - <image filename="minimize_focused_normal.png" x="0" y="0" width="object_width" height="object_height"/> +<!-- unmaximize icon --> +<draw_ops name="unmaximize_focused"> + <image filename="unmaximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> +<draw_ops name="unmaximize_focused_prelight"> + <image filename="unmaximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_focused_pressed"> + <image filename="unmaximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused"> + <image filename="unmaximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused_prelight"> + <include name="unmaximize_focused_prelight" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused_pressed"> + <include name="unmaximize_focused_pressed" /> +</draw_ops> + +<!-- minimize icon --> <draw_ops name="minimize_focused"> - <include name="minimize_glyph_focused" /> + <image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_focused_prelight"> - <image filename="minimize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_focused_pressed"> - <image filename="minimize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_glyph_unfocused"> - <image filename="minimize_unfocused.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_unfocused"> - <include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="minimize_glyph_unfocused_prelight"> - <image filename="minimize_unfocused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_unfocused_prelight"> - <include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="minimize_glyph_unfocused_pressed"> - <image filename="minimize_unfocused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> + <include name="minimize_focused_prelight" /> </draw_ops> <draw_ops name="minimize_unfocused_pressed"> - <include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> + <include name="minimize_focused_pressed" /> </draw_ops> -<draw_ops name="menu_glyph_focused"> - <image filename="menu.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> +<!-- menu icon --> +<draw_ops name="menu_focused"></draw_ops> -<draw_ops name="menu_focused"> - <include name="menu_glyph_focused" /> -</draw_ops> +<draw_ops name="menu_focused_prelight"></draw_ops> -<draw_ops name="menu_focused_prelight"> - <image filename="menu_prelight.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> +<draw_ops name="menu_focused_pressed"></draw_ops> -<draw_ops name="menu_focused_pressed"> - <image filename="menu-pressed.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> +<draw_ops name="menu_unfocused"></draw_ops> -<draw_ops name="menu_glyph_unfocused"> - <image filename="menu-unfocus.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> +<draw_ops name="menu_unfocused_prelight"></draw_ops> -<draw_ops name="menu_unfocused"> - <include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="menu_glyph_unfocused_prelight"> - <image filename="menu_prelight.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - -<draw_ops name="menu_unfocused_prelight"> - <include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="menu_glyph_unfocused_pressed"> - <image filename="menu-pressed.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - -<draw_ops name="menu_unfocused_pressed"> - <include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> -</draw_ops> - -<draw_ops name="shade_glyph_focused"></draw_ops> +<draw_ops name="menu_unfocused_pressed"></draw_ops> +<!-- shade icon --> <draw_ops name="shade_focused"> - <include name="shade_glyph_focused" /> +</draw_ops> + +<draw_ops name="shade_focused_prelight"> </draw_ops> <draw_ops name="shade_focused_pressed"> - <include name="shade_glyph_focused" y="0" /> </draw_ops> -<draw_ops name="shade_glyph_unfocused"></draw_ops> - <draw_ops name="shade_unfocused"> - <include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" /> </draw_ops> -<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops> - <draw_ops name="shade_unfocused_prelight"> - <include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" /> + <include name="shade_focused_prelight" /> </draw_ops> -<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops> - <draw_ops name="shade_unfocused_pressed"> - <include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" /> + <include name="shade_focused_pressed" /> </draw_ops> - <draw_ops name="unmaximize_focused_normal"> - <image filename="unmaximize_focused_normal.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_focused_prelight"> - <image filename="unmaximize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_focused_pressed"> - <image filename="unmaximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_unfocused_normal"> - <image filename="unmaximize_unfocused.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_unfocused_prelight"> - <image filename="unmaximize_unfocused_prelight.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> - <draw_ops name="unmaximize_unfocused_pressed"> - <image filename="unmaximize_unfocused_pressed.png" x="0" y="0" width="object_width" height="object_height"/> - </draw_ops> -<!-- frame styles --> +<!-- unshade icon --> +<draw_ops name="unshade_focused"> +</draw_ops> + +<draw_ops name="unshade_focused_prelight"> +</draw_ops> + +<draw_ops name="unshade_focused_pressed"> +</draw_ops> + +<draw_ops name="unshade_unfocused"> +</draw_ops> + +<draw_ops name="unshade_unfocused_prelight"> + <include name="unshade_focused_prelight" /> +</draw_ops> + +<draw_ops name="unshade_unfocused_pressed"> + <include name="unshade_focused_pressed" /> +</draw_ops> + +<!-- ::: FRAME STYLES ::: --> <frame_style name="normal_focused" geometry="normal"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> <piece position="title" draw_ops="title_focused" /> - <piece position="left_edge" draw_ops="draw_frame"/> - <piece position="right_edge" draw_ops="draw_frame"/> - <piece position="bottom_edge" draw_ops="bottom"/> + <piece position="overlay" draw_ops="rounded_border_focused" /> <button function="close" state="normal" draw_ops="close_focused" /> <button function="close" state="prelight" draw_ops="close_focused_prelight" /> <button function="close" state="pressed" draw_ops="close_focused_pressed" /> @@ -421,9 +370,11 @@ <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -439,27 +390,25 @@ <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> - <piece position="left_edge" draw_ops="draw_frame_unfocus"/> - <piece position="right_edge" draw_ops="draw_frame_unfocus"/> - <piece position="bottom_edge" draw_ops="bottom-inactive"/> - <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"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <piece position="overlay" draw_ops="rounded_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" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> <button function="shade" state="normal" draw_ops="shade_unfocused" /> <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> <button function="unabove" state="normal"><draw_ops></draw_ops></button> @@ -474,15 +423,12 @@ <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="titlebar_fill_focused" /> <piece position="title" draw_ops="title_focused" /> - <piece position="left_edge" draw_ops="draw_frame"/> - <piece position="right_edge" draw_ops="draw_frame"/> - <piece position="bottom_edge" draw_ops="bottom"/> <button function="close" state="normal" draw_ops="close_focused" /> <button function="close" state="prelight" draw_ops="close_focused_prelight" /> <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> <button function="minimize" state="normal" draw_ops="minimize_focused" /> <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> @@ -490,9 +436,11 @@ <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -508,28 +456,24 @@ <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> - <piece position="left_edge" draw_ops="draw_frame_unfocus"/> - <piece position="right_edge" draw_ops="draw_frame_unfocus"/> - <piece position="bottom_edge" draw_ops="bottom-inactive"/> - <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"/> - <button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <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" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> <button function="shade" state="normal" draw_ops="shade_unfocused" /> <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> <button function="unabove" state="normal"><draw_ops></draw_ops></button> @@ -544,12 +488,13 @@ <piece position="entire_background" draw_ops="entire_background_focused" /> <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" /> <button function="close" state="prelight" draw_ops="close_focused_prelight" /> <button function="close" state="pressed" draw_ops="close_focused_pressed" /> - <button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> <button function="minimize" state="normal" draw_ops="minimize_focused" /> <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> @@ -557,9 +502,11 @@ <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -575,25 +522,25 @@ <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_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"/> - <button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece> + <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" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> <button function="shade" state="normal" draw_ops="shade_unfocused" /> <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> - + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> <button function="unabove" state="normal"><draw_ops></draw_ops></button> @@ -604,26 +551,30 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="dialog_focused" geometry="normal"> +<frame_style name="dialog_focused" geometry="nobuttons"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> <piece position="title" draw_ops="title_focused" /> - <piece position="left_edge" draw_ops="draw_frame"/> - <piece position="right_edge" draw_ops="draw_frame"/> - <piece position="bottom_edge" draw_ops="bottom"/> - <button function="close" state="normal" draw_ops="close_focused"/> - <button function="close" state="prelight" draw_ops="close_focused_prelight"/> - <button function="close" state="pressed" draw_ops="close_focused_pressed"/> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> <button function="unabove" state="normal"><draw_ops></draw_ops></button> @@ -634,25 +585,28 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="dialog_unfocused" geometry="normal"> +<frame_style name="dialog_unfocused" geometry="nobuttons"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> - <piece position="left_edge" draw_ops="draw_frame_unfocus"/> - <piece position="right_edge" draw_ops="draw_frame_unfocus"/> - <piece position="bottom_edge" draw_ops="bottom-inactive"/> - <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"/> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <piece position="overlay" draw_ops="rounded_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" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -668,12 +622,10 @@ <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="titlebar_attached_focused" /> <piece position="title" draw_ops="title_focused" /> - <piece position="left_edge" draw_ops="draw_frame"/> - <piece position="right_edge" draw_ops="draw_frame"/> - <piece position="bottom_edge" draw_ops="bottom"/> - <button function="close" state="normal" draw_ops="close_focused"/> - <button function="close" state="prelight" draw_ops="close_focused_prelight"/> - <button function="close" state="pressed" draw_ops="close_focused_pressed"/> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> <button function="maximize" state="normal" draw_ops="maximize_focused" /> <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> @@ -684,9 +636,11 @@ <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -701,27 +655,25 @@ <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> - <piece position="left_edge" draw_ops="draw_frame_unfocus"/> - <piece position="right_edge" draw_ops="draw_frame_unfocus"/> - <piece position="bottom_edge" draw_ops="bottom-inactive"/> - <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"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <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" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> <button function="shade" state="normal" draw_ops="shade_unfocused" /> <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> <button function="unabove" state="normal"><draw_ops></draw_ops></button> @@ -732,26 +684,30 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="utility_focused" geometry="normal"> +<frame_style name="utility_focused" geometry="small"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="titlebar_focused" /> <piece position="title" draw_ops="title_focused" /> - <piece position="left_edge" draw_ops="draw_frame"/> - <piece position="right_edge" draw_ops="draw_frame"/> - <piece position="bottom_edge" draw_ops="bottom"/> - <button function="close" state="normal" draw_ops="close_focused"/> - <button function="close" state="prelight" draw_ops="close_focused_prelight"/> - <button function="close" state="pressed" draw_ops="close_focused_pressed"/> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> <button function="unabove" state="normal"><draw_ops></draw_ops></button> @@ -762,26 +718,29 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="utility_unfocused" geometry="normal"> +<frame_style name="utility_unfocused" geometry="small_unfocused"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> - <piece position="left_edge" draw_ops="draw_frame_unfocus"/> - <piece position="right_edge" draw_ops="draw_frame_unfocus"/> - <piece position="bottom_edge" draw_ops="bottom-inactive"/> - <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"/> - <button function="maximize" state="normal"><draw_ops></draw_ops></button> - <button function="maximize" state="pressed"><draw_ops></draw_ops></button> - <button function="minimize" state="normal"><draw_ops></draw_ops></button> - <button function="minimize" state="pressed"><draw_ops></draw_ops></button> - <button function="menu" state="normal"><draw_ops></draw_ops></button> - <button function="menu" state="pressed"><draw_ops></draw_ops></button> - <button function="shade" state="normal"><draw_ops></draw_ops></button> - <button function="shade" state="pressed"><draw_ops></draw_ops></button> - <button function="unshade" state="normal"><draw_ops></draw_ops></button> - <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <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" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> <button function="unabove" state="normal"><draw_ops></draw_ops></button> @@ -792,7 +751,7 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="border_focused" geometry="borderless"> +<frame_style name="border_focused" geometry="border"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="overlay" draw_ops="border_focused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> @@ -804,8 +763,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -817,7 +778,7 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="border_unfocused" geometry="borderless"> +<frame_style name="border_unfocused" geometry="border"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="overlay" draw_ops="border_unfocused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> @@ -829,8 +790,35 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <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="borderless" geometry="borderless"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -845,6 +833,8 @@ <frame_style name="attached_focused" geometry="attached"> <piece position="entire_background" draw_ops="entire_background_focused" /> <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></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> <button function="maximize" state="normal"><draw_ops></draw_ops></button> @@ -854,8 +844,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -869,7 +861,9 @@ <frame_style name="attached_unfocused" geometry="attached"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> - <piece position="titlebar" draw_ops="titlebar_attached_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> <button function="maximize" state="normal"><draw_ops></draw_ops></button> @@ -879,8 +873,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -910,9 +906,11 @@ <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -929,24 +927,24 @@ <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="border_right_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"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <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" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> <button function="shade" state="normal" draw_ops="shade_unfocused" /> <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> <button function="unabove" state="normal"><draw_ops></draw_ops></button> @@ -975,9 +973,11 @@ <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_focused" /> - <button function="unshade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -994,24 +994,24 @@ <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="border_left_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"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <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" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> <button function="shade" state="normal" draw_ops="shade_unfocused" /> <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> - <button function="unshade" state="normal" draw_ops="shade_unfocused" /> - <button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" /> - <button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> <button function="unabove" state="normal"><draw_ops></draw_ops></button> @@ -1033,8 +1033,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -1046,91 +1048,88 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<!-- frame style sets --> - +<!-- ::: FRAME STYLE SETS ::: --> <frame_style_set name="normal_style_set"> - <frame focus="yes" state="normal" resize="both" style="normal_focused"/> - <frame focus="no" state="normal" resize="both" style="normal_unfocused"/> - <frame focus="yes" state="maximized" style="normal_max_focused"/> - <frame focus="no" state="maximized" style="normal_max_unfocused"/> - <frame focus="yes" state="shaded" style="normal_focused"/> - <frame focus="no" state="shaded" style="normal_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/> - <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/> - <frame version=">= 3.3"focus="yes" state="tiled_left" style="tiled_left_focused"/> - <frame version=">= 3.3"focus="no" state="tiled_left" style="tiled_left_unfocused"/> - <frame version=">= 3.3"focus="yes" state="tiled_right" style="tiled_right_focused"/> - <frame version=">= 3.3"focus="no" state="tiled_right" style="tiled_right_unfocused"/> - <frame version=">= 3.3"focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/> - <frame version=">= 3.3"focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/> - <frame version=">= 3.3"focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/> - <frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/> + <frame focus="yes" state="normal" resize="both" style="normal_focused" /> + <frame focus="no" state="normal" resize="both" style="normal_unfocused" /> + <frame focus="yes" state="maximized" style="normal_max_focused" /> + <frame focus="no" state="maximized" style="normal_max_unfocused" /> + <frame focus="yes" state="shaded" style="normal_focused" /> + <frame focus="no" state="shaded" style="normal_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused" /> + <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused" /> + <frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused" /> + <frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused" /> + <frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused" /> + <frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused" /> + <frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused" /> + <frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused" /> + <frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused" /> + <frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused" /> </frame_style_set> <frame_style_set name="dialog_style_set"> - <frame focus="yes" state="normal" resize="both" style="dialog_focused"/> - <frame focus="no" state="normal" resize="both" style="dialog_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="dialog_focused"/> - <frame focus="no" state="shaded" style="dialog_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="dialog_focused" /> + <frame focus="no" state="shaded" style="dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> <frame_style_set name="modal_dialog_style_set"> - <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/> - <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="modal_dialog_focused"/> - <frame focus="no" state="shaded" style="modal_dialog_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="modal_dialog_focused" /> + <frame focus="no" state="shaded" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> <frame_style_set name="utility_style_set"> - <frame focus="yes" state="normal" resize="both" style="utility_focused"/> - <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="utility_focused"/> - <frame focus="no" state="shaded" style="utility_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="utility_focused" /> + <frame focus="no" state="normal" resize="both" style="utility_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="utility_focused" /> + <frame focus="no" state="shaded" style="utility_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> <frame_style_set name="border_style_set"> - <frame focus="yes" state="normal" resize="both" style="border_focused"/> - <frame focus="no" state="normal" resize="both" style="border_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="blank"/> - <frame focus="no" state="shaded" style="blank"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="border_focused" /> + <frame focus="no" state="normal" resize="both" style="border_unfocused" /> + <frame focus="yes" state="maximized" style="borderless" /> + <frame focus="no" state="maximized" style="borderless" /> + <frame focus="yes" state="shaded" style="blank" /> + <frame focus="no" state="shaded" style="blank" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> <frame_style_set name="attached_style_set"> - <frame focus="yes" state="normal" resize="both" style="attached_focused"/> - <frame focus="no" state="normal" resize="both" style="attached_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="blank"/> - <frame focus="no" state="shaded" style="blank"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="attached_focused" /> + <frame focus="no" state="normal" resize="both" style="attached_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="blank" /> + <frame focus="no" state="shaded" style="blank" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> - -<!-- windows --> - -<window type="normal" style_set="normal_style_set"/> -<window type="dialog" style_set="dialog_style_set"/> -<window type="modal_dialog" style_set="modal_dialog_style_set"/> -<window type="menu" style_set="utility_style_set"/> -<window type="utility" style_set="utility_style_set"/> -<window type="border" style_set="border_style_set"/> -<window version=">= 3.2" type="attached" style_set="attached_style_set"/> +<!-- ::: WINDOWS ::: --> +<window type="normal" style_set="normal_style_set" /> +<window type="dialog" style_set="dialog_style_set" /> +<window type="modal_dialog" style_set="modal_dialog_style_set" /> +<window type="menu" style_set="utility_style_set" /> +<window type="utility" style_set="utility_style_set" /> +<window type="border" style_set="border_style_set" /> +<window version=">= 3.2" type="attached" style_set="attached_style_set" /> </metacity_theme> diff --git a/metacity-1/minimize_unfocused_prelight.png b/metacity-1/minimize_unfocused_prelight.png deleted file mode 100644 index 2e86e18..0000000 Binary files a/metacity-1/minimize_unfocused_prelight.png and /dev/null differ diff --git a/metacity-1/minimize_unfocused_pressed.png b/metacity-1/minimize_unfocused_pressed.png deleted file mode 100644 index b7a3aca..0000000 Binary files a/metacity-1/minimize_unfocused_pressed.png and /dev/null differ diff --git a/metacity-1/trough_left.png b/metacity-1/trough_left.png deleted file mode 100644 index 74cc96e..0000000 Binary files a/metacity-1/trough_left.png and /dev/null differ diff --git a/metacity-1/trough_middle.png b/metacity-1/trough_middle.png deleted file mode 100644 index 74cc96e..0000000 Binary files a/metacity-1/trough_middle.png and /dev/null differ diff --git a/metacity-1/trough_right.png b/metacity-1/trough_right.png deleted file mode 100644 index 74cc96e..0000000 Binary files a/metacity-1/trough_right.png and /dev/null differ diff --git a/metacity-1/unmaximize_unfocused_prelight.png b/metacity-1/unmaximize_unfocused_prelight.png deleted file mode 100644 index f27f67d..0000000 Binary files a/metacity-1/unmaximize_unfocused_prelight.png and /dev/null differ diff --git a/metacity-1/unmaximize_unfocused_pressed.png b/metacity-1/unmaximize_unfocused_pressed.png deleted file mode 100644 index a132c2f..0000000 Binary files a/metacity-1/unmaximize_unfocused_pressed.png and /dev/null differ