diff --git a/install.sh b/install.sh index 8e8e9a41..c27eb713 100755 --- a/install.sh +++ b/install.sh @@ -170,11 +170,10 @@ install() { cp -r "${SRC_DIR}/assets/cinnamon/thumbnails/thumbnail${theme}${ctype}${color}.png" "${THEME_DIR}/cinnamon/thumbnail.png" mkdir -p "${THEME_DIR}/metacity-1" - cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-2${color}.xml" "${THEME_DIR}/metacity-1/metacity-theme-2.xml" - cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-3.xml" "${THEME_DIR}/metacity-1" - cp -r "${SRC_DIR}/assets/metacity-1/assets" "${THEME_DIR}/metacity-1" + cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-3${window}.xml" "${THEME_DIR}/metacity-1/metacity-theme-3.xml" + cp -r "${SRC_DIR}/assets/metacity-1/assets${window}" "${THEME_DIR}/metacity-1/assets" cp -r "${SRC_DIR}/assets/metacity-1/thumbnail${ELSE_DARK:-}.png" "${THEME_DIR}/metacity-1/thumbnail.png" - cd "${THEME_DIR}/metacity-1" && ln -s metacity-theme-2.xml metacity-theme-1.xml + cd "${THEME_DIR}/metacity-1" && ln -s metacity-theme-3.xml metacity-theme-1.xml && ln -s metacity-theme-3.xml metacity-theme-2.xml mkdir -p "${THEME_DIR}/xfwm4" cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${ctype}${window}/"*.png "${THEME_DIR}/xfwm4" @@ -182,11 +181,11 @@ install() { mkdir -p "${THEME_DIR}-hdpi/xfwm4" cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${ctype}${window}-hdpi/"*.png "${THEME_DIR}-hdpi/xfwm4" cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}" "${THEME_DIR}-hdpi/xfwm4/themerc" - sed -i "s/button_offset=6/button_offset=9/" "${THEME_DIR}-hdpi/xfwm4/themerc" + sed -i "s/button_offset=6/button_offset=9/" "${THEME_DIR}-hdpi/xfwm4/themerc" mkdir -p "${THEME_DIR}-xhdpi/xfwm4" cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${ctype}${window}-xhdpi/"*.png "${THEME_DIR}-xhdpi/xfwm4" cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}" "${THEME_DIR}-xhdpi/xfwm4/themerc" - sed -i "s/button_offset=6/button_offset=12/" "${THEME_DIR}-xhdpi/xfwm4/themerc" + sed -i "s/button_offset=6/button_offset=12/" "${THEME_DIR}-xhdpi/xfwm4/themerc" mkdir -p "${THEME_DIR}/plank" if [[ "$color" == '-light' ]]; then diff --git a/src/assets/metacity-1/assets-normal/button.svg b/src/assets/metacity-1/assets-normal/button.svg new file mode 100644 index 00000000..c2a738d8 --- /dev/null +++ b/src/assets/metacity-1/assets-normal/button.svg @@ -0,0 +1,41 @@ + + + + + + diff --git a/src/assets/metacity-1/assets-normal/close.svg b/src/assets/metacity-1/assets-normal/close.svg new file mode 100644 index 00000000..fb798d73 --- /dev/null +++ b/src/assets/metacity-1/assets-normal/close.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/src/assets/metacity-1/assets-normal/maximize.svg b/src/assets/metacity-1/assets-normal/maximize.svg new file mode 100644 index 00000000..0c2f1700 --- /dev/null +++ b/src/assets/metacity-1/assets-normal/maximize.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/src/assets/metacity-1/assets-normal/menu.svg b/src/assets/metacity-1/assets-normal/menu.svg new file mode 100644 index 00000000..179ff4c4 --- /dev/null +++ b/src/assets/metacity-1/assets-normal/menu.svg @@ -0,0 +1,40 @@ + + + + + + diff --git a/src/assets/metacity-1/assets-normal/minimize.svg b/src/assets/metacity-1/assets-normal/minimize.svg new file mode 100644 index 00000000..76fe7cbd --- /dev/null +++ b/src/assets/metacity-1/assets-normal/minimize.svg @@ -0,0 +1,47 @@ + + + + + + + + diff --git a/src/assets/metacity-1/assets-normal/shade.svg b/src/assets/metacity-1/assets-normal/shade.svg new file mode 100644 index 00000000..8213b036 --- /dev/null +++ b/src/assets/metacity-1/assets-normal/shade.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/src/assets/metacity-1/assets-normal/unmaximize.svg b/src/assets/metacity-1/assets-normal/unmaximize.svg new file mode 100644 index 00000000..8d60a570 --- /dev/null +++ b/src/assets/metacity-1/assets-normal/unmaximize.svg @@ -0,0 +1,67 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/assets/metacity-1/assets-normal/unshade.svg b/src/assets/metacity-1/assets-normal/unshade.svg new file mode 100644 index 00000000..a1615644 --- /dev/null +++ b/src/assets/metacity-1/assets-normal/unshade.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/src/main/metacity-1/metacity-theme-2-dark.xml b/src/main/metacity-1/metacity-theme-2-dark.xml deleted file mode 100644 index 7e7a215c..00000000 --- a/src/main/metacity-1/metacity-theme-2-dark.xml +++ /dev/null @@ -1,621 +0,0 @@ - - - - Orchis - vinceliucie - GPL - 2020 - Orchis Metacity theme - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -</draw_ops> - -<draw_ops name="title_unfocused"> - <title - x="(0 `max` ((width - title_width) / 2))" - y="(0 `max` ((height - title_height) / 2))" - color="C_title_unfocused"/> -</draw_ops> - -<!-- window decorations --> - -<draw_ops name="entire_background_focused"> - <rectangle color="C_titlebar_focused" x="0" y="0" width="width" height="height" filled="true"/> -</draw_ops> - -<draw_ops name="entire_background_unfocused"> - <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true"/> -</draw_ops> - -<draw_ops name="highlight_focused"> - <line color="C_highlight_focused" x1="4" y1="0" x2="width - 5" y2="0"/> - <arc color="C_highlight_focused" x="0 - 1" y="0" width="13" height="13" start_angle="270" extent_angle="90"/> - <arc color="C_highlight_focused" x="width - 13" y="0" width="13" height="13" start_angle="0" extent_angle="90"/> -</draw_ops> - -<draw_ops name="highlight_unfocused"> - <line color="C_highlight_unfocused" x1="4" y1="0" x2="width - 5" y2="0"/> - <arc color="C_highlight_unfocused" x="0 - 1" y="0" width="13" height="13" start_angle="270" extent_angle="90"/> - <arc color="C_highlight_unfocused" x="width - 13" y="0" width="13" height="13" start_angle="0" extent_angle="90"/> -</draw_ops> - -<draw_ops name="titlebar_focused"> - <include name="entire_background_focused"/> - <include name="highlight_focused"/> -</draw_ops> - -<draw_ops name="titlebar_unfocused"> - <include name="entire_background_unfocused"/> - <include name="highlight_unfocused"/> -</draw_ops> - -<!-- button icons --> - -<!-- close --> - -<draw_ops name="close_focused"> - <image filename="assets/close.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="close_focused_prelight"> - <include name="close_focused"/> -</draw_ops> - -<draw_ops name="close_focused_pressed"> - <include name="close_focused"/> -</draw_ops> - -<draw_ops name="close_unfocused"> - <image filename="assets/close.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="close_unfocused_prelight"> - <include name="close_unfocused"/> -</draw_ops> - -<draw_ops name="close_unfocused_pressed"> - <include name="close_unfocused"/> -</draw_ops> - -<!-- maximize --> - -<draw_ops name="maximize_focused"> - <image filename="assets/maximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="maximize_focused_prelight"> - <include name="maximize_focused"/> -</draw_ops> - -<draw_ops name="maximize_focused_pressed"> - <include name="maximize_focused"/> -</draw_ops> - -<draw_ops name="maximize_unfocused"> - <image filename="assets/maximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="maximize_unfocused_prelight"> - <include name="maximize_unfocused"/> -</draw_ops> - -<draw_ops name="maximize_unfocused_pressed"> - <include name="maximize_unfocused"/> -</draw_ops> - -<!-- unmaximize --> - -<draw_ops name="unmaximize_focused"> - <image filename="assets/unmaximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="unmaximize_focused_prelight"> - <include name="unmaximize_focused"/> -</draw_ops> - -<draw_ops name="unmaximize_focused_pressed"> - <include name="unmaximize_focused"/> -</draw_ops> - -<draw_ops name="unmaximize_unfocused"> - <image filename="assets/unmaximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="unmaximize_unfocused_prelight"> - <include name="unmaximize_unfocused"/> -</draw_ops> - -<draw_ops name="unmaximize_unfocused_pressed"> - <include name="unmaximize_unfocused"/> -</draw_ops> - -<!-- minimize --> - -<draw_ops name="minimize_focused"> - <image filename="assets/minimize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="minimize_focused_prelight"> - <include name="minimize_focused"/> -</draw_ops> - -<draw_ops name="minimize_focused_pressed"> - <include name="minimize_focused"/> -</draw_ops> - -<draw_ops name="minimize_unfocused"> - <image filename="assets/minimize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="minimize_unfocused_prelight"> - <include name="minimize_unfocused"/> -</draw_ops> - -<draw_ops name="minimize_unfocused_pressed"> - <include name="minimize_unfocused"/> -</draw_ops> - -<!-- menu --> - -<draw_ops name="menu_focused"> - <image filename="assets/menu.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="menu_focused_prelight"> - <include name="menu_focused"/> -</draw_ops> - -<draw_ops name="menu_focused_pressed"> - <include name="menu_focused"/> -</draw_ops> - -<draw_ops name="menu_unfocused"> - <image filename="assets/menu.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="menu_unfocused_prelight"> - <include name="menu_unfocused"/> -</draw_ops> - -<draw_ops name="menu_unfocused_pressed"> - <include name="menu_unfocused"/> -</draw_ops> - -<!-- shade --> - -<draw_ops name="shade_focused"> - <image filename="assets/shade.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="shade_focused_prelight"> - <include name="shade_focused"/> -</draw_ops> - -<draw_ops name="shade_focused_pressed"> - <include name="shade_focused"/> -</draw_ops> - -<draw_ops name="shade_unfocused"> - <image filename="assets/shade.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="shade_unfocused_prelight"> - <include name="shade_unfocused"/> -</draw_ops> - -<draw_ops name="shade_unfocused_pressed"> - <include name="shade_unfocused"/> -</draw_ops> - -<!-- unshade --> - -<draw_ops name="unshade_focused"> - <image filename="assets/unshade.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="unshade_focused_prelight"> - <include name="unshade_focused"/> -</draw_ops> - -<draw_ops name="unshade_focused_pressed"> - <include name="unshade_focused"/> -</draw_ops> - -<draw_ops name="unshade_unfocused"> - <image filename="assets/unshade.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="unshade_unfocused_prelight"> - <include name="unshade_unfocused"/> -</draw_ops> - -<draw_ops name="unshade_unfocused_pressed"> - <include name="unshade_unfocused"/> -</draw_ops> - -<!-- appmenu --> - -<constant name="D_appmenu_icon_size" value="16"/> - -<draw_ops name="appmenu_focused"> - <icon - x="(width - D_appmenu_icon_size) / 2" y="(height - D_appmenu_icon_size) / 2" - width="D_appmenu_icon_size" height="D_appmenu_icon_size"/> -</draw_ops> - -<draw_ops name="appmenu_focused_prelight"> - <include name="appmenu_focused"/> -</draw_ops> - -<draw_ops name="appmenu_focused_pressed"> - <include name="appmenu_focused"/> -</draw_ops> - -<draw_ops name="appmenu_unfocused"> - <icon - x="(width - D_appmenu_icon_size) / 2" y="(height - D_appmenu_icon_size) / 2" - width="D_appmenu_icon_size" height="D_appmenu_icon_size" - alpha="0.7"/> -</draw_ops> - -<draw_ops name="appmenu_unfocused_prelight"> - <include name="appmenu_unfocused"/> -</draw_ops> - -<draw_ops name="appmenu_unfocused_pressed"> - <include name="appmenu_unfocused"/> -</draw_ops> - -<!-- button backgrounds --> - -<draw_ops name="button_focused"> -</draw_ops> - -<draw_ops name="button_focused_prelight"> - <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.08" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="button_focused_pressed"> - <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.2" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="button_unfocused"> -</draw_ops> - -<draw_ops name="button_unfocused_prelight"> - <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.08" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="button_unfocused_pressed"> - <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.2" colorize="C_title_unfocused"/> -</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="titlebar_focused"/> - <piece position="title" draw_ops="title_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="left_middle_background" state="normal" draw_ops="button_focused"/> - <button function="left_middle_background" state="prelight" draw_ops="button_focused_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_focused_pressed"/> - <button function="right_middle_background" state="normal" draw_ops="button_focused"/> - <button function="right_middle_background" state="prelight" draw_ops="button_focused_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_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> - <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="normal_unfocused" geometry="normal"> - <piece position="entire_background" draw_ops="entire_background_unfocused"/> - <piece position="titlebar" draw_ops="titlebar_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="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="left_middle_background" state="normal" draw_ops="button_unfocused"/> - <button function="left_middle_background" state="prelight" draw_ops="button_unfocused_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_unfocused_pressed"/> - <button function="right_middle_background" state="normal" draw_ops="button_unfocused"/> - <button function="right_middle_background" state="prelight" draw_ops="button_unfocused_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_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> - <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="normal_max_focused" geometry="max" parent="normal_focused"> - <piece position="titlebar" draw_ops="entire_background_focused"/> - <button function="maximize" state="normal" draw_ops="unmaximize_focused"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/> -</frame_style> - -<frame_style name="normal_max_unfocused" geometry="max" parent="normal_unfocused"> - <piece position="titlebar" draw_ops="entire_background_unfocused"/> - <button function="maximize" state="normal" draw_ops="unmaximize_unfocused"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/> -</frame_style> - -<frame_style name="tiled_left_focused" geometry="tiled_left" parent="normal_focused"> - <piece position="titlebar" draw_ops="entire_background_focused"/> -</frame_style> - -<frame_style name="tiled_left_unfocused" geometry="tiled_left" parent="normal_unfocused"> - <piece position="titlebar" draw_ops="entire_background_unfocused"/> -</frame_style> - -<frame_style name="tiled_right_focused" geometry="tiled_right" parent="normal_focused"> - <piece position="titlebar" draw_ops="entire_background_focused"/> -</frame_style> - -<frame_style name="tiled_right_unfocused" geometry="tiled_right" parent="normal_unfocused"> - <piece position="titlebar" draw_ops="entire_background_unfocused"/> -</frame_style> - -<frame_style name="dialog_focused" geometry="nobuttons" parent="normal_focused"> -</frame_style> - -<frame_style name="dialog_unfocused" geometry="nobuttons" parent="normal_unfocused"> -</frame_style> - -<frame_style name="modal_dialog_focused" geometry="modal" parent="normal_focused"> -</frame_style> - -<frame_style name="modal_dialog_unfocused" geometry="modal" parent="normal_unfocused"> -</frame_style> - -<frame_style name="utility_focused" geometry="small" parent="normal_focused"> -</frame_style> - -<frame_style name="utility_unfocused" geometry="small" parent="normal_unfocused"> -</frame_style> - -<frame_style name="border_focused" geometry="border" parent="normal_focused"> -</frame_style> - -<frame_style name="border_unfocused" geometry="border" parent="normal_unfocused"> -</frame_style> - -<frame_style name="borderless_focused" geometry="borderless" parent="normal_focused"> -</frame_style> - -<frame_style name="borderless_unfocused" geometry="borderless" parent="normal_unfocused"> -</frame_style> - -<frame_style name="attached_focused" geometry="attached" parent="modal_dialog_focused"> -</frame_style> - -<frame_style name="attached_unfocused" geometry="attached" parent="modal_dialog_unfocused"> -</frame_style> - -<!-- placeholder for unimplementated styles--> - -<frame_style name="blank" geometry="normal"> - <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="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> - <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 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_focused"/> - <frame focus="no" state="maximized_and_shaded" style="normal_max_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_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_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_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="borderless_focused"/> - <frame focus="no" state="maximized" style="borderless_unfocused"/> - <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_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"/> - -</metacity_theme> diff --git a/src/main/metacity-1/metacity-theme-2-light.xml b/src/main/metacity-1/metacity-theme-2-light.xml deleted file mode 100644 index 9a52f56d..00000000 --- a/src/main/metacity-1/metacity-theme-2-light.xml +++ /dev/null @@ -1,621 +0,0 @@ -<?xml version="1.0"?> -<metacity_theme> -<info> - <name>Orchis</name> - <author>vinceliucie</author> - <copyright>GPL</copyright> - <date>2020</date> - <description>Orchis Metacity theme</description> -</info> - -<!-- meaningful constants --> - -<constant name="C_titlebar_focused" value="#e0e0e0"/> -<constant name="C_titlebar_unfocused" value="#d6d6d6"/> -<constant name="C_highlight_focused" value="blend/#e0e0e0/#ffffff/0.4"/> -<constant name="C_highlight_unfocused" value="blend/#d6d6d6/#ffffff/0.4"/> -<constant name="C_title_focused" value="blend/#e0e0e0/#000000/0.87"/> -<constant name="C_title_unfocused" value="blend/#d6d6d6/#000000/0.6"/> - -<!-- geometries --> - -<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4"> - <distance name="left_width" value="2"/> - <distance name="right_width" value="2"/> - <distance name="bottom_height" value="2"/> - <distance name="left_titlebar_edge" value="0"/> - <distance name="right_titlebar_edge" value="0"/> - <distance name="title_vertical_pad" value="13"/> - <border name="title_border" left="10" right="10" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> - <aspect_ratio name="button" value="1"/> -</frame_geometry> - -<frame_geometry name="max" 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"/> -</frame_geometry> - -<frame_geometry name="tiled_left" parent="max"> - <distance name="right_width" value="0"/> -</frame_geometry> - -<frame_geometry name="tiled_right" parent="max"> - <distance name="left_width" value="0"/> -</frame_geometry> - -<frame_geometry name="nobuttons" hide_buttons="true" parent="normal"> -</frame_geometry> - -<frame_geometry name="modal" parent="normal"> -</frame_geometry> - -<frame_geometry name="small" title_scale="small" parent="normal"> - <distance name="title_vertical_pad" value="8"/> -</frame_geometry> - -<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal"> - <distance name="left_width" value="2"/> - <distance name="right_width" value="2"/> - <distance name="bottom_height" value="2"/> - <distance name="title_vertical_pad" value="2"/> - <border name="title_border" left="10" right="10" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> -</frame_geometry> - -<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"/> - <distance name="title_vertical_pad" value="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> - <border name="title_border" left="0" right="0" top="0" bottom="0"/> -</frame_geometry> - -<frame_geometry name="attached" hide_buttons="true" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal"> - <distance name="title_vertical_pad" value="4"/> -</frame_geometry> - -<!-- drawing operations --> - -<!-- title --> - -<draw_ops name="title_focused"> - <title - x="(0 `max` ((width - title_width) / 2))" - y="(0 `max` ((height - title_height) / 2))" - color="C_title_focused"/> -</draw_ops> - -<draw_ops name="title_unfocused"> - <title - x="(0 `max` ((width - title_width) / 2))" - y="(0 `max` ((height - title_height) / 2))" - color="C_title_unfocused"/> -</draw_ops> - -<!-- window decorations --> - -<draw_ops name="entire_background_focused"> - <rectangle color="C_titlebar_focused" x="0" y="0" width="width" height="height" filled="true"/> -</draw_ops> - -<draw_ops name="entire_background_unfocused"> - <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true"/> -</draw_ops> - -<draw_ops name="highlight_focused"> - <line color="C_highlight_focused" x1="4" y1="0" x2="width - 5" y2="0"/> - <arc color="C_highlight_focused" x="0 - 1" y="0" width="13" height="13" start_angle="270" extent_angle="90"/> - <arc color="C_highlight_focused" x="width - 13" y="0" width="13" height="13" start_angle="0" extent_angle="90"/> -</draw_ops> - -<draw_ops name="highlight_unfocused"> - <line color="C_highlight_unfocused" x1="4" y1="0" x2="width - 5" y2="0"/> - <arc color="C_highlight_unfocused" x="0 - 1" y="0" width="13" height="13" start_angle="270" extent_angle="90"/> - <arc color="C_highlight_unfocused" x="width - 13" y="0" width="13" height="13" start_angle="0" extent_angle="90"/> -</draw_ops> - -<draw_ops name="titlebar_focused"> - <include name="entire_background_focused"/> - <include name="highlight_focused"/> -</draw_ops> - -<draw_ops name="titlebar_unfocused"> - <include name="entire_background_unfocused"/> - <include name="highlight_unfocused"/> -</draw_ops> - -<!-- button icons --> - -<!-- close --> - -<draw_ops name="close_focused"> - <image filename="assets/close.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="close_focused_prelight"> - <include name="close_focused"/> -</draw_ops> - -<draw_ops name="close_focused_pressed"> - <include name="close_focused"/> -</draw_ops> - -<draw_ops name="close_unfocused"> - <image filename="assets/close.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="close_unfocused_prelight"> - <include name="close_unfocused"/> -</draw_ops> - -<draw_ops name="close_unfocused_pressed"> - <include name="close_unfocused"/> -</draw_ops> - -<!-- maximize --> - -<draw_ops name="maximize_focused"> - <image filename="assets/maximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="maximize_focused_prelight"> - <include name="maximize_focused"/> -</draw_ops> - -<draw_ops name="maximize_focused_pressed"> - <include name="maximize_focused"/> -</draw_ops> - -<draw_ops name="maximize_unfocused"> - <image filename="assets/maximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="maximize_unfocused_prelight"> - <include name="maximize_unfocused"/> -</draw_ops> - -<draw_ops name="maximize_unfocused_pressed"> - <include name="maximize_unfocused"/> -</draw_ops> - -<!-- unmaximize --> - -<draw_ops name="unmaximize_focused"> - <image filename="assets/unmaximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="unmaximize_focused_prelight"> - <include name="unmaximize_focused"/> -</draw_ops> - -<draw_ops name="unmaximize_focused_pressed"> - <include name="unmaximize_focused"/> -</draw_ops> - -<draw_ops name="unmaximize_unfocused"> - <image filename="assets/unmaximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="unmaximize_unfocused_prelight"> - <include name="unmaximize_unfocused"/> -</draw_ops> - -<draw_ops name="unmaximize_unfocused_pressed"> - <include name="unmaximize_unfocused"/> -</draw_ops> - -<!-- minimize --> - -<draw_ops name="minimize_focused"> - <image filename="assets/minimize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="minimize_focused_prelight"> - <include name="minimize_focused"/> -</draw_ops> - -<draw_ops name="minimize_focused_pressed"> - <include name="minimize_focused"/> -</draw_ops> - -<draw_ops name="minimize_unfocused"> - <image filename="assets/minimize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="minimize_unfocused_prelight"> - <include name="minimize_unfocused"/> -</draw_ops> - -<draw_ops name="minimize_unfocused_pressed"> - <include name="minimize_unfocused"/> -</draw_ops> - -<!-- menu --> - -<draw_ops name="menu_focused"> - <image filename="assets/menu.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="menu_focused_prelight"> - <include name="menu_focused"/> -</draw_ops> - -<draw_ops name="menu_focused_pressed"> - <include name="menu_focused"/> -</draw_ops> - -<draw_ops name="menu_unfocused"> - <image filename="assets/menu.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="menu_unfocused_prelight"> - <include name="menu_unfocused"/> -</draw_ops> - -<draw_ops name="menu_unfocused_pressed"> - <include name="menu_unfocused"/> -</draw_ops> - -<!-- shade --> - -<draw_ops name="shade_focused"> - <image filename="assets/shade.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="shade_focused_prelight"> - <include name="shade_focused"/> -</draw_ops> - -<draw_ops name="shade_focused_pressed"> - <include name="shade_focused"/> -</draw_ops> - -<draw_ops name="shade_unfocused"> - <image filename="assets/shade.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="shade_unfocused_prelight"> - <include name="shade_unfocused"/> -</draw_ops> - -<draw_ops name="shade_unfocused_pressed"> - <include name="shade_unfocused"/> -</draw_ops> - -<!-- unshade --> - -<draw_ops name="unshade_focused"> - <image filename="assets/unshade.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="unshade_focused_prelight"> - <include name="unshade_focused"/> -</draw_ops> - -<draw_ops name="unshade_focused_pressed"> - <include name="unshade_focused"/> -</draw_ops> - -<draw_ops name="unshade_unfocused"> - <image filename="assets/unshade.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="unshade_unfocused_prelight"> - <include name="unshade_unfocused"/> -</draw_ops> - -<draw_ops name="unshade_unfocused_pressed"> - <include name="unshade_unfocused"/> -</draw_ops> - -<!-- appmenu --> - -<constant name="D_appmenu_icon_size" value="16"/> - -<draw_ops name="appmenu_focused"> - <icon - x="(width - D_appmenu_icon_size) / 2" y="(height - D_appmenu_icon_size) / 2" - width="D_appmenu_icon_size" height="D_appmenu_icon_size"/> -</draw_ops> - -<draw_ops name="appmenu_focused_prelight"> - <include name="appmenu_focused"/> -</draw_ops> - -<draw_ops name="appmenu_focused_pressed"> - <include name="appmenu_focused"/> -</draw_ops> - -<draw_ops name="appmenu_unfocused"> - <icon - x="(width - D_appmenu_icon_size) / 2" y="(height - D_appmenu_icon_size) / 2" - width="D_appmenu_icon_size" height="D_appmenu_icon_size" - alpha="0.7"/> -</draw_ops> - -<draw_ops name="appmenu_unfocused_prelight"> - <include name="appmenu_unfocused"/> -</draw_ops> - -<draw_ops name="appmenu_unfocused_pressed"> - <include name="appmenu_unfocused"/> -</draw_ops> - -<!-- button backgrounds --> - -<draw_ops name="button_focused"> -</draw_ops> - -<draw_ops name="button_focused_prelight"> - <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.08" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="button_focused_pressed"> - <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.2" colorize="C_title_focused"/> -</draw_ops> - -<draw_ops name="button_unfocused"> -</draw_ops> - -<draw_ops name="button_unfocused_prelight"> - <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.08" colorize="C_title_unfocused"/> -</draw_ops> - -<draw_ops name="button_unfocused_pressed"> - <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.2" colorize="C_title_unfocused"/> -</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="titlebar_focused"/> - <piece position="title" draw_ops="title_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="left_middle_background" state="normal" draw_ops="button_focused"/> - <button function="left_middle_background" state="prelight" draw_ops="button_focused_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_focused_pressed"/> - <button function="right_middle_background" state="normal" draw_ops="button_focused"/> - <button function="right_middle_background" state="prelight" draw_ops="button_focused_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_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> - <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="normal_unfocused" geometry="normal"> - <piece position="entire_background" draw_ops="entire_background_unfocused"/> - <piece position="titlebar" draw_ops="titlebar_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="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="left_middle_background" state="normal" draw_ops="button_unfocused"/> - <button function="left_middle_background" state="prelight" draw_ops="button_unfocused_prelight"/> - <button function="left_middle_background" state="pressed" draw_ops="button_unfocused_pressed"/> - <button function="right_middle_background" state="normal" draw_ops="button_unfocused"/> - <button function="right_middle_background" state="prelight" draw_ops="button_unfocused_prelight"/> - <button function="right_middle_background" state="pressed" draw_ops="button_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> - <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="normal_max_focused" geometry="max" parent="normal_focused"> - <piece position="titlebar" draw_ops="entire_background_focused"/> - <button function="maximize" state="normal" draw_ops="unmaximize_focused"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/> -</frame_style> - -<frame_style name="normal_max_unfocused" geometry="max" parent="normal_unfocused"> - <piece position="titlebar" draw_ops="entire_background_unfocused"/> - <button function="maximize" state="normal" draw_ops="unmaximize_unfocused"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/> -</frame_style> - -<frame_style name="tiled_left_focused" geometry="tiled_left" parent="normal_focused"> - <piece position="titlebar" draw_ops="entire_background_focused"/> -</frame_style> - -<frame_style name="tiled_left_unfocused" geometry="tiled_left" parent="normal_unfocused"> - <piece position="titlebar" draw_ops="entire_background_unfocused"/> -</frame_style> - -<frame_style name="tiled_right_focused" geometry="tiled_right" parent="normal_focused"> - <piece position="titlebar" draw_ops="entire_background_focused"/> -</frame_style> - -<frame_style name="tiled_right_unfocused" geometry="tiled_right" parent="normal_unfocused"> - <piece position="titlebar" draw_ops="entire_background_unfocused"/> -</frame_style> - -<frame_style name="dialog_focused" geometry="nobuttons" parent="normal_focused"> -</frame_style> - -<frame_style name="dialog_unfocused" geometry="nobuttons" parent="normal_unfocused"> -</frame_style> - -<frame_style name="modal_dialog_focused" geometry="modal" parent="normal_focused"> -</frame_style> - -<frame_style name="modal_dialog_unfocused" geometry="modal" parent="normal_unfocused"> -</frame_style> - -<frame_style name="utility_focused" geometry="small" parent="normal_focused"> -</frame_style> - -<frame_style name="utility_unfocused" geometry="small" parent="normal_unfocused"> -</frame_style> - -<frame_style name="border_focused" geometry="border" parent="normal_focused"> -</frame_style> - -<frame_style name="border_unfocused" geometry="border" parent="normal_unfocused"> -</frame_style> - -<frame_style name="borderless_focused" geometry="borderless" parent="normal_focused"> -</frame_style> - -<frame_style name="borderless_unfocused" geometry="borderless" parent="normal_unfocused"> -</frame_style> - -<frame_style name="attached_focused" geometry="attached" parent="modal_dialog_focused"> -</frame_style> - -<frame_style name="attached_unfocused" geometry="attached" parent="modal_dialog_unfocused"> -</frame_style> - -<!-- placeholder for unimplementated styles--> - -<frame_style name="blank" geometry="normal"> - <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="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> - <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 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_focused"/> - <frame focus="no" state="maximized_and_shaded" style="normal_max_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_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_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_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="borderless_focused"/> - <frame focus="no" state="maximized" style="borderless_unfocused"/> - <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_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"/> - -</metacity_theme> diff --git a/src/main/metacity-1/metacity-theme-2.xml b/src/main/metacity-1/metacity-theme-3-normal.xml similarity index 58% rename from src/main/metacity-1/metacity-theme-2.xml rename to src/main/metacity-1/metacity-theme-3-normal.xml index 89784d1b..153a0921 100644 --- a/src/main/metacity-1/metacity-theme-2.xml +++ b/src/main/metacity-1/metacity-theme-3-normal.xml @@ -1,33 +1,35 @@ <?xml version="1.0"?> <metacity_theme> <info> - <name>Orchis</name> + <name>Colloid</name> <author>vinceliucie</author> <copyright>GPL</copyright> - <date>2020</date> - <description>Orchis Metacity theme</description> + <date>2022</date> + <description>Colloid Metacity theme</description> </info> <!-- meaningful constants --> -<constant name="C_titlebar_focused" value="#383838"/> -<constant name="C_titlebar_unfocused" value="#303030"/> -<constant name="C_highlight_focused" value="blend/#383838/#ffffff/0.1"/> -<constant name="C_highlight_unfocused" value="blend/#303030/#ffffff/0.1"/> -<constant name="C_title_focused" value="blend/#383838/#ffffff/1"/> -<constant name="C_title_unfocused" value="blend/#303030/#ffffff/0.7"/> +<constant name="C_titlebar_focused" value="gtk:custom(wm_bg,gtk:bg[NORMAL])"/> +<constant name="C_titlebar_unfocused" value="gtk:custom(wm_unfocused_bg,gtk:bg[NORMAL])"/> +<constant name="C_highlight_focused" value="gtk:custom(wm_highlight,gtk:base[NORMAL])"/> +<constant name="C_highlight_unfocused" value="gtk:custom(wm_highlight,gtk:base[NORMAL])"/> +<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])"/> +<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])"/> +<constant name="C_border_focused" value="gtk:custom(wm_border,blend/#000000/gtk:bg[NORMAL]/0.5)"/> +<constant name="C_border_unfocused" value="gtk:custom(wm_border,blend/#000000/gtk:bg[NORMAL]/0.65)"/> <!-- geometries --> -<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4"> - <distance name="left_width" value="2"/> - <distance name="right_width" value="2"/> - <distance name="bottom_height" value="2"/> - <distance name="left_titlebar_edge" value="0"/> - <distance name="right_titlebar_edge" value="0"/> - <distance name="title_vertical_pad" value="13"/> - <border name="title_border" left="10" right="10" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> +<frame_geometry name="normal" title_scale="medium" rounded_top_left="10" rounded_top_right="10"> + <distance name="left_width" value="1"/> + <distance name="right_width" value="1"/> + <distance name="bottom_height" value="1"/> + <distance name="left_titlebar_edge" value="6"/> + <distance name="right_titlebar_edge" value="6"/> + <distance name="title_vertical_pad" value="10"/> + <border name="title_border" left="10" right="10" top="6" bottom="6"/> + <border name="button_border" left="3" right="3" top="5" bottom="5"/> <aspect_ratio name="button" value="1"/> </frame_geometry> @@ -38,11 +40,11 @@ </frame_geometry> <frame_geometry name="tiled_left" parent="max"> - <distance name="right_width" value="0"/> + <distance name="right_width" value="1"/> </frame_geometry> <frame_geometry name="tiled_right" parent="max"> - <distance name="left_width" value="0"/> + <distance name="left_width" value="1"/> </frame_geometry> <frame_geometry name="nobuttons" hide_buttons="true" parent="normal"> @@ -56,10 +58,10 @@ </frame_geometry> <frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal"> - <distance name="left_width" value="2"/> - <distance name="right_width" value="2"/> - <distance name="bottom_height" value="2"/> - <distance name="title_vertical_pad" value="2"/> + <distance name="left_width" value="1"/> + <distance name="right_width" value="1"/> + <distance name="bottom_height" value="1"/> + <distance name="title_vertical_pad" value="0"/> <border name="title_border" left="10" right="10" top="0" bottom="0"/> <border name="button_border" left="0" right="0" top="0" bottom="0"/> </frame_geometry> @@ -73,8 +75,8 @@ <border name="title_border" left="0" right="0" top="0" bottom="0"/> </frame_geometry> -<frame_geometry name="attached" hide_buttons="true" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal"> - <distance name="title_vertical_pad" value="4"/> +<frame_geometry name="attached" hide_buttons="true" rounded_bottom_left="6" rounded_bottom_right="6" parent="normal"> + <distance name="title_vertical_pad" value="6"/> </frame_geometry> <!-- drawing operations --> @@ -82,17 +84,27 @@ <!-- title --> <draw_ops name="title_focused"> - <title + <title version="< 3.1" x="(0 `max` ((width - title_width) / 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)))" + y="(0 `max` ((height - title_height) / 2))" + ellipsize_width="width" + color="C_title_focused"/> </draw_ops> <draw_ops name="title_unfocused"> - <title + <title version="< 3.1" x="(0 `max` ((width - title_width) / 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)))" + y="(0 `max` ((height - title_height) / 2))" + ellipsize_width="width" + color="C_title_unfocused"/> </draw_ops> <!-- window decorations --> @@ -105,132 +117,228 @@ <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true"/> </draw_ops> -<draw_ops name="highlight_focused"> - <line color="C_highlight_focused" x1="4" y1="0" x2="width - 5" y2="0"/> - <arc color="C_highlight_focused" x="0 - 1" y="0" width="13" height="13" start_angle="270" extent_angle="90"/> - <arc color="C_highlight_focused" x="width - 13" y="0" width="13" height="13" start_angle="0" extent_angle="90"/> -</draw_ops> - -<draw_ops name="highlight_unfocused"> - <line color="C_highlight_unfocused" x1="4" y1="0" x2="width - 5" y2="0"/> - <arc color="C_highlight_unfocused" x="0 - 1" y="0" width="13" height="13" start_angle="270" extent_angle="90"/> - <arc color="C_highlight_unfocused" x="width - 13" y="0" width="13" height="13" start_angle="0" extent_angle="90"/> -</draw_ops> - <draw_ops name="titlebar_focused"> <include name="entire_background_focused"/> - <include name="highlight_focused"/> </draw_ops> <draw_ops name="titlebar_unfocused"> <include name="entire_background_unfocused"/> - <include name="highlight_unfocused"/> +</draw_ops> + +<draw_ops name="rounded_border_focused"> + <line color="C_border_focused" x1="12" y1="0" x2="width-13" 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="12" x2="0" y2="height-2" /> + <line color="C_border_focused" x1="width-1" y1="12" x2="width-1" y2="height-2" /> + <arc color="C_border_focused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_focused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" /> + <line color="C_highlight_focused" x1="13" y1="1" x2="width - 14" y2="1"/> + <arc color="C_highlight_focused" x="0" y="1" width="25" height="25" start_angle="270" extent_angle="90"/> + <arc color="C_highlight_focused" x="width - 26" y="1" width="25" height="25" start_angle="0" extent_angle="90"/> +</draw_ops> + +<draw_ops name="rounded_border_unfocused"> + <line color="C_border_unfocused" x1="12" y1="0" x2="width-13" 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="12" x2="0" y2="height-2" /> + <line color="C_border_unfocused" x1="width-1" y1="12" x2="width-1" y2="height-2" /> + <arc color="C_border_unfocused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_unfocused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" /> + <line color="C_highlight_unfocused" x1="13" y1="1" x2="width - 14" y2="1"/> + <arc color="C_highlight_unfocused" x="0" y="1" width="25" height="25" start_angle="270" extent_angle="90"/> + <arc color="C_highlight_unfocused" x="width - 26" y="1" width="25" height="25" start_angle="0" extent_angle="90"/> </draw_ops> <!-- button icons --> +<draw_ops name="windows_button_focused"> + <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.1" colorize="C_title_focused"/> +</draw_ops> + +<draw_ops name="windows_button_focused_prelight"> + <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.15" colorize="C_title_focused"/> +</draw_ops> + +<draw_ops name="windows_button_focused_pressed"> + <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.2" colorize="C_title_focused"/> +</draw_ops> + +<draw_ops name="windows_button_unfocused"> + <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.06" colorize="C_title_focused"/> +</draw_ops> + +<draw_ops name="windows_button_unfocused_prelight"> + <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.1" colorize="C_title_focused"/> +</draw_ops> + +<draw_ops name="windows_button_unfocused_pressed"> + <image filename="assets/button.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.15" colorize="C_title_focused"/> +</draw_ops> + <!-- close --> -<draw_ops name="close_focused"> +<draw_ops name="windows_close_icon_focused"> <image filename="assets/close.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> </draw_ops> +<draw_ops name="windows_close_icon_unfocused"> + <image filename="assets/close.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.35" colorize="C_title_unfocused"/> +</draw_ops> + +<draw_ops name="close_focused"> + <include name="windows_close_icon_focused"/> + <include name="windows_button_focused"/> +</draw_ops> + <draw_ops name="close_focused_prelight"> - <include name="close_focused"/> + <include name="windows_close_icon_focused"/> + <include name="windows_button_focused_prelight"/> </draw_ops> <draw_ops name="close_focused_pressed"> - <include name="close_focused"/> + <include name="windows_close_icon_focused"/> + <include name="windows_button_focused_pressed"/> </draw_ops> <draw_ops name="close_unfocused"> - <image filename="assets/close.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> + <include name="windows_close_icon_unfocused"/> + <include name="windows_button_unfocused"/> </draw_ops> <draw_ops name="close_unfocused_prelight"> - <include name="close_unfocused"/> + <include name="windows_close_icon_unfocused"/> + <include name="windows_button_unfocused_prelight"/> </draw_ops> <draw_ops name="close_unfocused_pressed"> - <include name="close_unfocused"/> + <include name="windows_close_icon_unfocused"/> + <include name="windows_button_unfocused_pressed"/> </draw_ops> <!-- maximize --> -<draw_ops name="maximize_focused"> +<draw_ops name="windows_maximize_icon_focused"> <image filename="assets/maximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> </draw_ops> +<draw_ops name="windows_maximize_icon_unfocused"> + <image filename="assets/maximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.35" colorize="C_title_unfocused"/> +</draw_ops> + +<draw_ops name="maximize_focused"> + <include name="windows_maximize_icon_focused"/> + <include name="windows_button_focused"/> +</draw_ops> + <draw_ops name="maximize_focused_prelight"> - <include name="maximize_focused"/> + <include name="windows_maximize_icon_focused"/> + <include name="windows_button_focused_prelight"/> </draw_ops> <draw_ops name="maximize_focused_pressed"> - <include name="maximize_focused"/> + <include name="windows_maximize_icon_focused"/> + <include name="windows_button_focused_pressed"/> </draw_ops> <draw_ops name="maximize_unfocused"> - <image filename="assets/maximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> + <include name="windows_maximize_icon_unfocused"/> + <include name="windows_button_unfocused"/> </draw_ops> <draw_ops name="maximize_unfocused_prelight"> - <include name="maximize_unfocused"/> + <include name="windows_maximize_icon_unfocused"/> + <include name="windows_button_unfocused_prelight"/> </draw_ops> <draw_ops name="maximize_unfocused_pressed"> - <include name="maximize_unfocused"/> + <include name="windows_maximize_icon_unfocused"/> + <include name="windows_button_unfocused_pressed"/> </draw_ops> <!-- unmaximize --> -<draw_ops name="unmaximize_focused"> +<draw_ops name="windows_unmaximize_icon_focused"> <image filename="assets/unmaximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> </draw_ops> +<draw_ops name="windows_unmaximize_icon_unfocused"> + <image filename="assets/unmaximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.35" colorize="C_title_unfocused"/> +</draw_ops> + +<draw_ops name="unmaximize_focused"> + <include name="windows_unmaximize_icon_focused"/> + <include name="windows_button_focused"/> +</draw_ops> + <draw_ops name="unmaximize_focused_prelight"> - <include name="unmaximize_focused"/> + <include name="windows_unmaximize_icon_focused"/> + <include name="windows_button_focused_prelight"/> </draw_ops> <draw_ops name="unmaximize_focused_pressed"> - <include name="unmaximize_focused"/> + <include name="windows_unmaximize_icon_focused"/> + <include name="windows_button_focused_pressed"/> </draw_ops> <draw_ops name="unmaximize_unfocused"> - <image filename="assets/unmaximize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> + <include name="windows_unmaximize_icon_unfocused"/> + <include name="windows_button_unfocused"/> </draw_ops> <draw_ops name="unmaximize_unfocused_prelight"> - <include name="unmaximize_unfocused"/> + <include name="windows_unmaximize_icon_unfocused"/> + <include name="windows_button_unfocused_prelight"/> </draw_ops> <draw_ops name="unmaximize_unfocused_pressed"> - <include name="unmaximize_unfocused"/> + <include name="windows_unmaximize_icon_unfocused"/> + <include name="windows_button_unfocused_pressed"/> </draw_ops> <!-- minimize --> -<draw_ops name="minimize_focused"> +<draw_ops name="windows_minimize_icon_focused"> <image filename="assets/minimize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_focused"/> </draw_ops> +<draw_ops name="windows_minimize_icon_unfocused"> + <image filename="assets/minimize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.35" colorize="C_title_unfocused"/> +</draw_ops> + +<draw_ops name="minimize_focused"> + <include name="windows_minimize_icon_focused"/> + <include name="windows_button_focused"/> +</draw_ops> + <draw_ops name="minimize_focused_prelight"> - <include name="minimize_focused"/> + <include name="windows_minimize_icon_focused"/> + <include name="windows_button_focused_prelight"/> </draw_ops> <draw_ops name="minimize_focused_pressed"> - <include name="minimize_focused"/> + <include name="windows_minimize_icon_focused"/> + <include name="windows_button_focused_pressed"/> </draw_ops> <draw_ops name="minimize_unfocused"> - <image filename="assets/minimize.svg" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height" alpha="0.7" colorize="C_title_unfocused"/> + <include name="windows_minimize_icon_unfocused"/> + <include name="windows_button_unfocused"/> </draw_ops> <draw_ops name="minimize_unfocused_prelight"> - <include name="minimize_unfocused"/> + <include name="windows_minimize_icon_unfocused"/> + <include name="windows_button_unfocused_prelight"/> </draw_ops> <draw_ops name="minimize_unfocused_pressed"> - <include name="minimize_unfocused"/> + <include name="windows_minimize_icon_unfocused"/> + <include name="windows_button_unfocused_pressed"/> </draw_ops> <!-- menu --> @@ -374,6 +482,7 @@ <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="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"/> @@ -386,6 +495,9 @@ <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 version=">= 3.5" function="appmenu" state="normal" draw_ops="appmenu_focused"/> + <button version=">= 3.5" function="appmenu" state="prelight" draw_ops="appmenu_focused_prelight"/> + <button version=">= 3.5" function="appmenu" state="pressed" draw_ops="appmenu_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"/> @@ -414,6 +526,7 @@ <piece position="entire_background" draw_ops="entire_background_unfocused"/> <piece position="titlebar" draw_ops="titlebar_unfocused"/> <piece position="title" draw_ops="title_unfocused"/> + <piece position="overlay" draw_ops="rounded_border_unfocused"/> <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"/> @@ -426,6 +539,9 @@ <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 version=">= 3.5" function="appmenu" state="normal" draw_ops="appmenu_unfocused"/> + <button version=">= 3.5" function="appmenu" state="prelight" draw_ops="appmenu_unfocused_prelight"/> + <button version=">= 3.5" function="appmenu" state="pressed" draw_ops="appmenu_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"/> @@ -450,40 +566,112 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="normal_max_focused" geometry="max" parent="normal_focused"> - <piece position="titlebar" draw_ops="entire_background_focused"/> +<frame_style name="normal_max_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused"/> + <piece position="titlebar" draw_ops="titlebar_focused"/> + <piece position="title" draw_ops="title_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="unmaximize_focused"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/> <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/> + <button function="maximize" state="pressed" draw_ops="unmaximize_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 version=">= 3.5" function="appmenu" state="normal" draw_ops="appmenu_focused"/> + <button version=">= 3.5" function="appmenu" state="prelight" draw_ops="appmenu_focused_prelight"/> + <button version=">= 3.5" function="appmenu" state="pressed" draw_ops="appmenu_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="left_middle_background" state="normal" draw_ops="button_focused"/> + <button function="left_middle_background" state="prelight" draw_ops="button_focused_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_focused_pressed"/> + <button function="right_middle_background" state="normal" draw_ops="button_focused"/> + <button function="right_middle_background" state="prelight" draw_ops="button_focused_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_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> + <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="normal_max_unfocused" geometry="max" parent="normal_unfocused"> - <piece position="titlebar" draw_ops="entire_background_unfocused"/> +<frame_style name="normal_max_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused"/> + <piece position="titlebar" draw_ops="titlebar_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"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/> <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="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 version=">= 3.5" function="appmenu" state="normal" draw_ops="appmenu_unfocused"/> + <button version=">= 3.5" function="appmenu" state="prelight" draw_ops="appmenu_unfocused_prelight"/> + <button version=">= 3.5" function="appmenu" state="pressed" draw_ops="appmenu_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="left_middle_background" state="normal" draw_ops="button_unfocused"/> + <button function="left_middle_background" state="prelight" draw_ops="button_unfocused_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_unfocused_pressed"/> + <button function="right_middle_background" state="normal" draw_ops="button_unfocused"/> + <button function="right_middle_background" state="prelight" draw_ops="button_unfocused_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_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> + <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="tiled_left_focused" geometry="tiled_left" parent="normal_focused"> +<frame_style name="tiled_left_focused" geometry="tiled_left" parent="normal_max_focused"> <piece position="titlebar" draw_ops="entire_background_focused"/> </frame_style> -<frame_style name="tiled_left_unfocused" geometry="tiled_left" parent="normal_unfocused"> +<frame_style name="tiled_left_unfocused" geometry="tiled_left" parent="normal_max_unfocused"> <piece position="titlebar" draw_ops="entire_background_unfocused"/> </frame_style> -<frame_style name="tiled_right_focused" geometry="tiled_right" parent="normal_focused"> +<frame_style name="tiled_right_focused" geometry="tiled_right" parent="normal_max_focused"> <piece position="titlebar" draw_ops="entire_background_focused"/> </frame_style> -<frame_style name="tiled_right_unfocused" geometry="tiled_right" parent="normal_unfocused"> +<frame_style name="tiled_right_unfocused" geometry="tiled_right" parent="normal_max_unfocused"> <piece position="titlebar" draw_ops="entire_background_unfocused"/> </frame_style> -<frame_style name="dialog_focused" geometry="nobuttons" parent="normal_focused"> +<frame_style name="dialog_focused" geometry="modal" parent="normal_focused"> </frame_style> -<frame_style name="dialog_unfocused" geometry="nobuttons" parent="normal_unfocused"> +<frame_style name="dialog_unfocused" geometry="modal" parent="normal_unfocused"> </frame_style> <frame_style name="modal_dialog_focused" geometry="modal" parent="normal_focused"> @@ -527,6 +715,8 @@ <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 version=">= 3.5" function="appmenu" state="normal"><draw_ops></draw_ops></button> + <button version=">= 3.5" function="appmenu" 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> @@ -552,6 +742,14 @@ <frame focus="no" state="shaded" style="normal_unfocused"/> <frame focus="yes" state="maximized_and_shaded" style="normal_max_focused"/> <frame focus="no" state="maximized_and_shaded" style="normal_max_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"> @@ -617,5 +815,6 @@ <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/src/main/metacity-1/metacity-theme-3.xml b/src/main/metacity-1/metacity-theme-3.xml index 4d5465ed..582cc8ef 100644 --- a/src/main/metacity-1/metacity-theme-3.xml +++ b/src/main/metacity-1/metacity-theme-3.xml @@ -14,6 +14,8 @@ <constant name="C_titlebar_unfocused" value="gtk:custom(wm_unfocused_bg,gtk:bg[NORMAL])"/> <constant name="C_highlight_focused" value="gtk:custom(wm_highlight,gtk:base[NORMAL])"/> <constant name="C_highlight_unfocused" value="gtk:custom(wm_highlight,gtk:base[NORMAL])"/> +<constant name="C_border_focused" value="gtk:custom(wm_border,blend/#000000/gtk:bg[NORMAL]/0.5)"/> +<constant name="C_border_unfocused" value="gtk:custom(wm_border,blend/#000000/gtk:bg[NORMAL]/0.65)"/> <constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])"/> <constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])"/> <constant name="C_button_icon" value="gtk:custom(wm_button_icon,gtk:base[NORMAL])" /> @@ -26,10 +28,10 @@ <!-- geometries --> -<frame_geometry name="normal" title_scale="medium" rounded_top_left="12" rounded_top_right="12"> - <distance name="left_width" value="0"/> - <distance name="right_width" value="0"/> - <distance name="bottom_height" value="0"/> +<frame_geometry name="normal" title_scale="medium" rounded_top_left="10" rounded_top_right="10"> + <distance name="left_width" value="1"/> + <distance name="right_width" value="1"/> + <distance name="bottom_height" value="1"/> <distance name="left_titlebar_edge" value="6"/> <distance name="right_titlebar_edge" value="6"/> <distance name="title_vertical_pad" value="10"/> @@ -45,11 +47,11 @@ </frame_geometry> <frame_geometry name="tiled_left" parent="max"> - <distance name="right_width" value="0"/> + <distance name="right_width" value="1"/> </frame_geometry> <frame_geometry name="tiled_right" parent="max"> - <distance name="left_width" value="0"/> + <distance name="left_width" value="1"/> </frame_geometry> <frame_geometry name="nobuttons" hide_buttons="true" parent="normal"> @@ -63,9 +65,9 @@ </frame_geometry> <frame_geometry name="border" 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"/> + <distance name="left_width" value="1"/> + <distance name="right_width" value="1"/> + <distance name="bottom_height" value="1"/> <distance name="title_vertical_pad" value="0"/> <border name="title_border" left="10" right="10" top="0" bottom="0"/> <border name="button_border" left="0" right="0" top="0" bottom="0"/> @@ -80,8 +82,8 @@ <border name="title_border" left="0" right="0" top="0" bottom="0"/> </frame_geometry> -<frame_geometry name="attached" hide_buttons="true" rounded_bottom_left="8" rounded_bottom_right="8" parent="normal"> - <distance name="title_vertical_pad" value="8"/> +<frame_geometry name="attached" hide_buttons="true" rounded_bottom_left="6" rounded_bottom_right="6" parent="normal"> + <distance name="title_vertical_pad" value="6"/> </frame_geometry> <!-- drawing operations --> @@ -122,26 +124,42 @@ <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true"/> </draw_ops> -<draw_ops name="highlight_focused"> - <line color="C_highlight_focused" x1="4" y1="0" x2="width - 5" y2="0"/> - <arc color="C_highlight_focused" x="0 - 1" y="0" width="13" height="13" start_angle="270" extent_angle="90"/> - <arc color="C_highlight_focused" x="width - 13" y="0" width="13" height="13" start_angle="0" extent_angle="90"/> -</draw_ops> - -<draw_ops name="highlight_unfocused"> - <line color="C_highlight_unfocused" x1="4" y1="0" x2="width - 5" y2="0"/> - <arc color="C_highlight_unfocused" x="0 - 1" y="0" width="13" height="13" start_angle="270" extent_angle="90"/> - <arc color="C_highlight_unfocused" x="width - 13" y="0" width="13" height="13" start_angle="0" extent_angle="90"/> -</draw_ops> - <draw_ops name="titlebar_focused"> <include name="entire_background_focused"/> - <include name="highlight_focused"/> </draw_ops> <draw_ops name="titlebar_unfocused"> <include name="entire_background_unfocused"/> - <include name="highlight_unfocused"/> +</draw_ops> + +<draw_ops name="rounded_border_focused"> + <line color="C_border_focused" x1="12" y1="0" x2="width-13" 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="12" x2="0" y2="height-2" /> + <line color="C_border_focused" x1="width-1" y1="12" x2="width-1" y2="height-2" /> + <arc color="C_border_focused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_focused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" /> + <line color="C_highlight_focused" x1="13" y1="1" x2="width - 14" y2="1"/> + <arc color="C_highlight_focused" x="0" y="1" width="25" height="25" start_angle="270" extent_angle="90"/> + <arc color="C_highlight_focused" x="width - 26" y="1" width="25" height="25" start_angle="0" extent_angle="90"/> +</draw_ops> + +<draw_ops name="rounded_border_unfocused"> + <line color="C_border_unfocused" x1="12" y1="0" x2="width-13" 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="12" x2="0" y2="height-2" /> + <line color="C_border_unfocused" x1="width-1" y1="12" x2="width-1" y2="height-2" /> + <arc color="C_border_unfocused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_unfocused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" /> + <line color="C_highlight_unfocused" x1="13" y1="1" x2="width - 14" y2="1"/> + <arc color="C_highlight_unfocused" x="0" y="1" width="25" height="25" start_angle="270" extent_angle="90"/> + <arc color="C_highlight_unfocused" x="width - 26" y="1" width="25" height="25" start_angle="0" extent_angle="90"/> </draw_ops> <!-- button icons --> @@ -399,6 +417,7 @@ <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="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"/> @@ -442,6 +461,7 @@ <piece position="entire_background" draw_ops="entire_background_unfocused"/> <piece position="titlebar" draw_ops="titlebar_unfocused"/> <piece position="title" draw_ops="title_unfocused"/> + <piece position="overlay" draw_ops="rounded_border_unfocused"/> <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"/> @@ -481,33 +501,105 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<frame_style name="normal_max_focused" geometry="max" parent="normal_focused"> - <piece position="titlebar" draw_ops="entire_background_focused"/> +<frame_style name="normal_max_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused"/> + <piece position="titlebar" draw_ops="titlebar_focused"/> + <piece position="title" draw_ops="title_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="unmaximize_focused"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/> <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/> + <button function="maximize" state="pressed" draw_ops="unmaximize_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 version=">= 3.5" function="appmenu" state="normal" draw_ops="appmenu_focused"/> + <button version=">= 3.5" function="appmenu" state="prelight" draw_ops="appmenu_focused_prelight"/> + <button version=">= 3.5" function="appmenu" state="pressed" draw_ops="appmenu_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="left_middle_background" state="normal" draw_ops="button_focused"/> + <button function="left_middle_background" state="prelight" draw_ops="button_focused_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_focused_pressed"/> + <button function="right_middle_background" state="normal" draw_ops="button_focused"/> + <button function="right_middle_background" state="prelight" draw_ops="button_focused_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_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> + <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="normal_max_unfocused" geometry="max" parent="normal_unfocused"> - <piece position="titlebar" draw_ops="entire_background_unfocused"/> +<frame_style name="normal_max_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused"/> + <piece position="titlebar" draw_ops="titlebar_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"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/> <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="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 version=">= 3.5" function="appmenu" state="normal" draw_ops="appmenu_unfocused"/> + <button version=">= 3.5" function="appmenu" state="prelight" draw_ops="appmenu_unfocused_prelight"/> + <button version=">= 3.5" function="appmenu" state="pressed" draw_ops="appmenu_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="left_middle_background" state="normal" draw_ops="button_unfocused"/> + <button function="left_middle_background" state="prelight" draw_ops="button_unfocused_prelight"/> + <button function="left_middle_background" state="pressed" draw_ops="button_unfocused_pressed"/> + <button function="right_middle_background" state="normal" draw_ops="button_unfocused"/> + <button function="right_middle_background" state="prelight" draw_ops="button_unfocused_prelight"/> + <button function="right_middle_background" state="pressed" draw_ops="button_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> + <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="tiled_left_focused" geometry="tiled_left" parent="normal_focused"> +<frame_style name="tiled_left_focused" geometry="tiled_left" parent="normal_max_focused"> <piece position="titlebar" draw_ops="entire_background_focused"/> </frame_style> -<frame_style name="tiled_left_unfocused" geometry="tiled_left" parent="normal_unfocused"> +<frame_style name="tiled_left_unfocused" geometry="tiled_left" parent="normal_max_unfocused"> <piece position="titlebar" draw_ops="entire_background_unfocused"/> </frame_style> -<frame_style name="tiled_right_focused" geometry="tiled_right" parent="normal_focused"> +<frame_style name="tiled_right_focused" geometry="tiled_right" parent="normal_max_focused"> <piece position="titlebar" draw_ops="entire_background_focused"/> </frame_style> -<frame_style name="tiled_right_unfocused" geometry="tiled_right" parent="normal_unfocused"> +<frame_style name="tiled_right_unfocused" geometry="tiled_right" parent="normal_max_unfocused"> <piece position="titlebar" draw_ops="entire_background_unfocused"/> </frame_style> diff --git a/src/sass/gtk/_colors-public.scss b/src/sass/gtk/_colors-public.scss index a18a75f3..d43978b0 100644 --- a/src/sass/gtk/_colors-public.scss +++ b/src/sass/gtk/_colors-public.scss @@ -87,9 +87,13 @@ these are pretty self explicative */ /* these colors are exported for the window manager and shouldn't be used in applications, read if you used those and something break with a version upgrade you're on your own... */ + +$windows-border: if($variant == 'light', mix(black, $base, 35%), mix(black, $base, 80%)); + @define-color wm_title #{"" + $titlebar-text}; @define-color wm_unfocused_title #{"" + $titlebar-text-secondary}; @define-color wm_highlight #{"" + highlight($titlebar)}; +@define-color wm_border #{"" + $windows-border}; @define-color wm_bg #{"" + $titlebar}; @define-color wm_unfocused_bg #{"" + $titlebar-backdrop};