diff --git a/ChangeLog b/ChangeLog index d5784307a..d53334f67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,18 @@ * src/menu.c (meta_window_menu_new): Use the real workspace names instead of making up numbers. +2002-07-23 Havoc Pennington + + * src/themes/Makefile.am (THEMES): put Gorilla back in the build + + * src/themes/Gorilla/metacity-theme-1.xml, + src/themes/Crux/metacity-theme-1.xml: fixes from + Sebastien Delestaing so that these themes work properly with + different font sizes. + + * src/frames.c (get_control): patch from Balamurali Viswanathan + for #81984 (resize titlebar from the top not the bottom) + 2002-07-23 Havoc Pennington * src/keybindings.c (meta_display_process_key_event): handle diff --git a/src/frames.c b/src/frames.c index b4fbc13f9..7580f7078 100644 --- a/src/frames.c +++ b/src/frames.c @@ -1755,6 +1755,7 @@ control_rect (MetaFrameControl control, } #define RESIZE_EXTENDS 15 +#define TOP_RESIZE_HEIGHT 2 static MetaFrameControl get_control (MetaFrames *frames, MetaUIFrame *frame, @@ -1805,9 +1806,6 @@ get_control (MetaFrames *frames, int bottom_of_titlebar; bottom_of_titlebar = fgeom.title_rect.y + fgeom.title_rect.height; - - if (y < bottom_of_titlebar) - goto noresize; /* South resize always has priority over north resize, * in case of overlap. @@ -1858,7 +1856,7 @@ get_control (MetaFrames *frames, if (has_vert) return META_FRAME_CONTROL_RESIZE_S; } - else if (y >= bottom_of_titlebar && y < fgeom.top_height) + else if (y < TOP_RESIZE_HEIGHT) { if (has_vert) return META_FRAME_CONTROL_RESIZE_N; diff --git a/src/themes/AgingGorilla/active-button.png b/src/themes/AgingGorilla/active-button.png index a299ddb23..64455b330 100644 Binary files a/src/themes/AgingGorilla/active-button.png and b/src/themes/AgingGorilla/active-button.png differ diff --git a/src/themes/AgingGorilla/active-close-button.png b/src/themes/AgingGorilla/active-close-button.png index b77f77ae1..1d2921657 100644 Binary files a/src/themes/AgingGorilla/active-close-button.png and b/src/themes/AgingGorilla/active-close-button.png differ diff --git a/src/themes/AgingGorilla/active-close-menu-icon.png b/src/themes/AgingGorilla/active-close-menu-icon.png new file mode 100644 index 000000000..b77f77ae1 Binary files /dev/null and b/src/themes/AgingGorilla/active-close-menu-icon.png differ diff --git a/src/themes/AgingGorilla/active-maximize-button.png b/src/themes/AgingGorilla/active-maximize-button.png index 02ccc37a2..a982e5cb4 100644 Binary files a/src/themes/AgingGorilla/active-maximize-button.png and b/src/themes/AgingGorilla/active-maximize-button.png differ diff --git a/src/themes/AgingGorilla/active-maximize-menu-icon.png b/src/themes/AgingGorilla/active-maximize-menu-icon.png new file mode 100644 index 000000000..02ccc37a2 Binary files /dev/null and b/src/themes/AgingGorilla/active-maximize-menu-icon.png differ diff --git a/src/themes/AgingGorilla/active-menu-button.png b/src/themes/AgingGorilla/active-menu-button.png index aa12b497a..b55d7078e 100644 Binary files a/src/themes/AgingGorilla/active-menu-button.png and b/src/themes/AgingGorilla/active-menu-button.png differ diff --git a/src/themes/AgingGorilla/active-minimize-button.png b/src/themes/AgingGorilla/active-minimize-button.png index 292769297..4205f4e82 100644 Binary files a/src/themes/AgingGorilla/active-minimize-button.png and b/src/themes/AgingGorilla/active-minimize-button.png differ diff --git a/src/themes/AgingGorilla/active-minimize-menu-icon.png b/src/themes/AgingGorilla/active-minimize-menu-icon.png new file mode 100644 index 000000000..292769297 Binary files /dev/null and b/src/themes/AgingGorilla/active-minimize-menu-icon.png differ diff --git a/src/themes/AgingGorilla/inactive-close-button.png b/src/themes/AgingGorilla/inactive-close-button.png index 863599215..c566b12f2 100644 Binary files a/src/themes/AgingGorilla/inactive-close-button.png and b/src/themes/AgingGorilla/inactive-close-button.png differ diff --git a/src/themes/AgingGorilla/inactive-maximize-button.png b/src/themes/AgingGorilla/inactive-maximize-button.png index 4e8929999..9c838823c 100644 Binary files a/src/themes/AgingGorilla/inactive-maximize-button.png and b/src/themes/AgingGorilla/inactive-maximize-button.png differ diff --git a/src/themes/AgingGorilla/inactive-menu-button.png b/src/themes/AgingGorilla/inactive-menu-button.png index 99476b747..b000a3789 100644 Binary files a/src/themes/AgingGorilla/inactive-menu-button.png and b/src/themes/AgingGorilla/inactive-menu-button.png differ diff --git a/src/themes/AgingGorilla/inactive-minimize-button.png b/src/themes/AgingGorilla/inactive-minimize-button.png index 125aa6f7d..4459af4e5 100644 Binary files a/src/themes/AgingGorilla/inactive-minimize-button.png and b/src/themes/AgingGorilla/inactive-minimize-button.png differ diff --git a/src/themes/AgingGorilla/metacity-theme-1.xml b/src/themes/AgingGorilla/metacity-theme-1.xml index fd9290fc3..7dde366ae 100644 --- a/src/themes/AgingGorilla/metacity-theme-1.xml +++ b/src/themes/AgingGorilla/metacity-theme-1.xml @@ -18,32 +18,15 @@ - - + - - + + - - - - - - - - - - - - - - - - @@ -58,82 +41,73 @@ - + - - - - + + + + - + <title color="gray" x="IconTitleSpacing" y="0"/> </draw_ops> </piece> <piece position="titlebar"> - <draw_ops> - <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/> - <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/> + <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/> + <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/> </draw_ops> </piece> <button function="close" state="normal"> <draw_ops> - <include name="inactive_button"/> - <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="close" state="pressed"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="minimize" state="normal"> <draw_ops> - <include name="inactive_button"/> - <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="minimize" state="pressed"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="maximize" state="normal"> <draw_ops> - <include name="inactive_button"/> - <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="maximize" state="pressed"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="normal"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="pressed"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> @@ -155,81 +129,73 @@ <rectangle color="light gray" x="4" y="4" width="width - 9" height="height - 8" filled="false"/> <rectangle color="light gray" x="5" y="5" width="width - 11" height="height - 10" filled="false"/> <rectangle color="white" x="6" y="6" width="width - 13" height="height - 12" filled="false"/> - <rectangle color="gray" x="6" y="6" width="width - 12" height="height - 12" filled="true"/> + <rectangle color="gtk:bg[NORMAL]" x="6" y="6" width="width - 12" height="height - 12" filled="true"/> - <line color="gray" x1="0" y1="0" x2="1" y2="1"/> - <line color="gray" x1="0" y1="height - 1" x2="1" y2="height"/> - <line color="gray" x1="width - 1" y1="0" x2="width" y2="1"/> - <line color="gray" x1="width" y1="height" x2="width - 1" y2="height - 1"/> + <line color="gtk:bg[NORMAL]" x1="0" y1="0" x2="1" y2="1"/> + <line color="gtk:bg[NORMAL]" x1="0" y1="height - 1" x2="1" y2="height"/> + <line color="gtk:bg[NORMAL]" x1="width - 1" y1="0" x2="width" y2="1"/> + <line color="gtk:bg[NORMAL]" x1="width" y1="height" x2="width - 1" y2="height - 1"/> </draw_ops> </piece> <piece position="title"> <draw_ops> - <title color="white" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/> + <title color="white" x="IconTitleSpacing" y="0"/> </draw_ops> </piece> <piece position="titlebar"> <draw_ops> - <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/> - <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/> + <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/> + <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/> </draw_ops> </piece> <button function="close" state="normal"> <draw_ops> - <include name="active_button"/> - <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="close" state="pressed"> <draw_ops> - <include name="active_button_pressed"/> - <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="minimize" state="normal"> <draw_ops> - <include name="active_button"/> - <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="minimize" state="pressed"> <draw_ops> - <include name="active_button_pressed"/> - <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="maximize" state="normal"> <draw_ops> - <include name="active_button"/> - <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="maximize" state="pressed"> <draw_ops> - <include name="active_button_pressed"/> - <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="normal"> <draw_ops> - <include name="active_button"/> - <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="pressed"> <draw_ops> - <include name="active_button_pressed"/> - <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> @@ -256,10 +222,11 @@ <window type="modal_dialog" style_set="normal"/> <window type="menu" style_set="normal"/> <window type="utility" style_set="normal"/> +<window type="border" style_set="normal"/> <menu_icon function="maximize" state="normal"> <draw_ops> - <image filename="active-maximize-button.png" + <image filename="active-maximize-menu-icon.png" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height"/> @@ -269,7 +236,7 @@ <menu_icon function="close" state="normal"> <draw_ops> - <image filename="active-close-button.png" + <image filename="active-close-menu-icon.png" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height"/> @@ -278,7 +245,7 @@ <menu_icon function="minimize" state="normal"> <draw_ops> - <image filename="active-minimize-button.png" + <image filename="active-minimize-menu-icon.png" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height"/> diff --git a/src/themes/Crux/active-border-top-left-border.png b/src/themes/Crux/active-border-top-left-border.png index ea1e66511..2d61acf54 100644 Binary files a/src/themes/Crux/active-border-top-left-border.png and b/src/themes/Crux/active-border-top-left-border.png differ diff --git a/src/themes/Crux/active-border-top-right-border.png b/src/themes/Crux/active-border-top-right-border.png index 521735b9d..9797c0fc2 100644 Binary files a/src/themes/Crux/active-border-top-right-border.png and b/src/themes/Crux/active-border-top-right-border.png differ diff --git a/src/themes/Crux/active-bottom-left-border.png b/src/themes/Crux/active-bottom-left-border.png index c6657c6d9..e85c329fa 100644 Binary files a/src/themes/Crux/active-bottom-left-border.png and b/src/themes/Crux/active-bottom-left-border.png differ diff --git a/src/themes/Crux/active-bottom-right-border.png b/src/themes/Crux/active-bottom-right-border.png index ed25d07a7..4bcfe8a37 100644 Binary files a/src/themes/Crux/active-bottom-right-border.png and b/src/themes/Crux/active-bottom-right-border.png differ diff --git a/src/themes/Crux/active-button-prelight.png b/src/themes/Crux/active-button-prelight.png index 7c8aa2fe6..6da2ae253 100644 Binary files a/src/themes/Crux/active-button-prelight.png and b/src/themes/Crux/active-button-prelight.png differ diff --git a/src/themes/Crux/active-button-pressed.png b/src/themes/Crux/active-button-pressed.png index b3c7bcc14..4fb94aa48 100644 Binary files a/src/themes/Crux/active-button-pressed.png and b/src/themes/Crux/active-button-pressed.png differ diff --git a/src/themes/Crux/active-button.png b/src/themes/Crux/active-button.png index 5269b51ab..cd93b8c54 100644 Binary files a/src/themes/Crux/active-button.png and b/src/themes/Crux/active-button.png differ diff --git a/src/themes/Crux/active-left-border.png b/src/themes/Crux/active-left-border.png index eb74fe879..699a2d279 100644 Binary files a/src/themes/Crux/active-left-border.png and b/src/themes/Crux/active-left-border.png differ diff --git a/src/themes/Crux/active-left-top-border.png b/src/themes/Crux/active-left-top-border.png index 7268769fe..567b4a0fe 100644 Binary files a/src/themes/Crux/active-left-top-border.png and b/src/themes/Crux/active-left-top-border.png differ diff --git a/src/themes/Crux/active-menu-button-prelight.png b/src/themes/Crux/active-menu-button-prelight.png index 794f6db2e..db0a88c8a 100644 Binary files a/src/themes/Crux/active-menu-button-prelight.png and b/src/themes/Crux/active-menu-button-prelight.png differ diff --git a/src/themes/Crux/active-menu-button-pressed.png b/src/themes/Crux/active-menu-button-pressed.png index dbdc18ed8..8ac8201dd 100644 Binary files a/src/themes/Crux/active-menu-button-pressed.png and b/src/themes/Crux/active-menu-button-pressed.png differ diff --git a/src/themes/Crux/active-menu-button.png b/src/themes/Crux/active-menu-button.png index 8b110f587..de8e1a7b1 100644 Binary files a/src/themes/Crux/active-menu-button.png and b/src/themes/Crux/active-menu-button.png differ diff --git a/src/themes/Crux/active-right-border.png b/src/themes/Crux/active-right-border.png index 61c84b121..bcb546621 100644 Binary files a/src/themes/Crux/active-right-border.png and b/src/themes/Crux/active-right-border.png differ diff --git a/src/themes/Crux/active-right-top-border.png b/src/themes/Crux/active-right-top-border.png index 4dd314f6a..8b50f0473 100644 Binary files a/src/themes/Crux/active-right-top-border.png and b/src/themes/Crux/active-right-top-border.png differ diff --git a/src/themes/Crux/active-top-center-left.png b/src/themes/Crux/active-top-center-left.png index 7275abb04..aee3b7668 100644 Binary files a/src/themes/Crux/active-top-center-left.png and b/src/themes/Crux/active-top-center-left.png differ diff --git a/src/themes/Crux/active-top-center-mid-left.png b/src/themes/Crux/active-top-center-mid-left.png index 56678367a..927d50e90 100644 Binary files a/src/themes/Crux/active-top-center-mid-left.png and b/src/themes/Crux/active-top-center-mid-left.png differ diff --git a/src/themes/Crux/inactive-border-top-left-border.png b/src/themes/Crux/inactive-border-top-left-border.png index 61e7dc96e..0f6a1b88b 100644 Binary files a/src/themes/Crux/inactive-border-top-left-border.png and b/src/themes/Crux/inactive-border-top-left-border.png differ diff --git a/src/themes/Crux/inactive-border-top-right-border.png b/src/themes/Crux/inactive-border-top-right-border.png index 819d66c7e..0e37f50b2 100644 Binary files a/src/themes/Crux/inactive-border-top-right-border.png and b/src/themes/Crux/inactive-border-top-right-border.png differ diff --git a/src/themes/Crux/inactive-bottom-left-border.png b/src/themes/Crux/inactive-bottom-left-border.png index 3cb1ecc84..6d5e0ec2d 100644 Binary files a/src/themes/Crux/inactive-bottom-left-border.png and b/src/themes/Crux/inactive-bottom-left-border.png differ diff --git a/src/themes/Crux/inactive-bottom-right-border.png b/src/themes/Crux/inactive-bottom-right-border.png index cfd0c6c83..3302e0154 100644 Binary files a/src/themes/Crux/inactive-bottom-right-border.png and b/src/themes/Crux/inactive-bottom-right-border.png differ diff --git a/src/themes/Crux/inactive-button-prelight.png b/src/themes/Crux/inactive-button-prelight.png index 49be9fd05..070a164e2 100644 Binary files a/src/themes/Crux/inactive-button-prelight.png and b/src/themes/Crux/inactive-button-prelight.png differ diff --git a/src/themes/Crux/inactive-button-pressed.png b/src/themes/Crux/inactive-button-pressed.png index d215f9ac5..88f3f8a0a 100644 Binary files a/src/themes/Crux/inactive-button-pressed.png and b/src/themes/Crux/inactive-button-pressed.png differ diff --git a/src/themes/Crux/inactive-button.png b/src/themes/Crux/inactive-button.png index a13abffb0..e74564d26 100644 Binary files a/src/themes/Crux/inactive-button.png and b/src/themes/Crux/inactive-button.png differ diff --git a/src/themes/Crux/inactive-left-border.png b/src/themes/Crux/inactive-left-border.png index 681a566dc..a98ee930a 100644 Binary files a/src/themes/Crux/inactive-left-border.png and b/src/themes/Crux/inactive-left-border.png differ diff --git a/src/themes/Crux/inactive-left-top-border.png b/src/themes/Crux/inactive-left-top-border.png index 50ed2a8c9..126943426 100644 Binary files a/src/themes/Crux/inactive-left-top-border.png and b/src/themes/Crux/inactive-left-top-border.png differ diff --git a/src/themes/Crux/inactive-menu-button-prelight.png b/src/themes/Crux/inactive-menu-button-prelight.png index ecf6f9405..8c45a1bb4 100644 Binary files a/src/themes/Crux/inactive-menu-button-prelight.png and b/src/themes/Crux/inactive-menu-button-prelight.png differ diff --git a/src/themes/Crux/inactive-menu-button-pressed.png b/src/themes/Crux/inactive-menu-button-pressed.png index a3a4ab842..757ff7c2b 100644 Binary files a/src/themes/Crux/inactive-menu-button-pressed.png and b/src/themes/Crux/inactive-menu-button-pressed.png differ diff --git a/src/themes/Crux/inactive-menu-button.png b/src/themes/Crux/inactive-menu-button.png index e6961df24..89b2a4424 100644 Binary files a/src/themes/Crux/inactive-menu-button.png and b/src/themes/Crux/inactive-menu-button.png differ diff --git a/src/themes/Crux/inactive-right-border.png b/src/themes/Crux/inactive-right-border.png index e9a009f13..206375bf3 100644 Binary files a/src/themes/Crux/inactive-right-border.png and b/src/themes/Crux/inactive-right-border.png differ diff --git a/src/themes/Crux/inactive-right-top-border.png b/src/themes/Crux/inactive-right-top-border.png index e8a523be7..8b225ae53 100644 Binary files a/src/themes/Crux/inactive-right-top-border.png and b/src/themes/Crux/inactive-right-top-border.png differ diff --git a/src/themes/Crux/inactive-top-center-left.png b/src/themes/Crux/inactive-top-center-left.png index d281f9289..f901f13eb 100644 Binary files a/src/themes/Crux/inactive-top-center-left.png and b/src/themes/Crux/inactive-top-center-left.png differ diff --git a/src/themes/Crux/inactive-top-center-right.png b/src/themes/Crux/inactive-top-center-right.png index 2ea82f32f..c4ec5eebf 100644 Binary files a/src/themes/Crux/inactive-top-center-right.png and b/src/themes/Crux/inactive-top-center-right.png differ diff --git a/src/themes/Crux/metacity-theme-1.xml b/src/themes/Crux/metacity-theme-1.xml index 88da751de..b2219df7b 100644 --- a/src/themes/Crux/metacity-theme-1.xml +++ b/src/themes/Crux/metacity-theme-1.xml @@ -19,11 +19,10 @@ <distance name="bottom_height" value="6"/> <distance name="left_titlebar_edge" value="5"/> <distance name="right_titlebar_edge" value="6"/> - <distance name="button_width" value="16"/> - <distance name="button_height" value="16"/> - <distance name="title_vertical_pad" value="6"/> - <border name="title_border" left="0" right="0" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <aspect_ratio name="button" value="1.0"/> + <distance name="title_vertical_pad" value="0"/> + <border name="title_border" left="0" right="0" top="3" bottom="3"/> + <border name="button_border" left="0" right="0" top="3" bottom="3"/> </frame_geometry> <frame_geometry name="border" has_title="false"> @@ -34,7 +33,7 @@ <distance name="right_titlebar_edge" value="0"/> <distance name="button_width" value="0"/> <distance name="button_height" value="0"/> - <distance name="title_vertical_pad" value="6"/> + <distance name="title_vertical_pad" value="5"/> <border name="title_border" left="0" right="0" top="0" bottom="0"/> <border name="button_border" left="0" right="0" top="0" bottom="0"/> </frame_geometry> @@ -42,27 +41,27 @@ <!-- Buttons --> <draw_ops name="active_button"> - <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="active-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> <draw_ops name="active_button_pressed"> - <image filename="active-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="active-button-pressed.png" x="0" y="0" width="width" height="height"/> </draw_ops> <draw_ops name="active_button_prelight"> - <image filename="active-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="active-button-prelight.png" x="0" y="0" width="width" height="height"/> </draw_ops> <draw_ops name="inactive_button"> - <image filename="inactive-button.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="inactive-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> <draw_ops name="inactive_button_pressed"> - <image filename="inactive-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="inactive-button-pressed.png" x="0" y="0" width="width" height="height"/> </draw_ops> <draw_ops name="inactive_button_prelight"> - <image filename="inactive-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="inactive-button-prelight.png" x="0" y="0" width="width" height="height"/> </draw_ops> <!-- Inactive style --> @@ -81,37 +80,34 @@ <piece position="title"> <draw_ops> - <title color="white" x="IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/> + <title color="white" x="IconTitleSpacing" y="0"/> </draw_ops> </piece> <piece position="titlebar"> <draw_ops> - <image filename="inactive-left-top-border.png" - x="0" y="3" width="object_width" height="height"/> - <image filename="inactive-top-left-border.png" - x="0" y="0" width="object_width" height="object_height"/> - <image filename="inactive-top-right-border.png" - x="width - object_width" y="0" width="object_width" height="object_height"/> + <image filename="inactive-left-top-border.png" + x="0" y="0" width="object_width" height="height"/> <image filename="inactive-right-top-border.png" - x="width - object_width" y="3" width="object_width" height="object_height"/> + x="width - object_width" y="0" width="object_width" height="height"/> <image filename="inactive-top-center-left.png" x="4" y="0" width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" - height="object_height"/> + height="height"/> <image filename="inactive-top-center-mid.png" - x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1" - y="0" width="object_width" height="object_height"/> + x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1" + y="0" width="object_width * height / 22" height="height"/> <image filename="inactive-top-center-right.png" - x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth) `min` (width - 3 * ButtonWidth - right_width)) + 1" + x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth * height / 22) `min` (width - 3 * ButtonWidth - right_width)) + 1" y="0" - width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)" - height="object_height"/> + width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth * height / 22 - right_width) `max` (3 * ButtonWidth)" + height="height"/> + </draw_ops> </piece> @@ -143,80 +139,80 @@ <button function="close" state="normal"> <draw_ops> <include name="inactive_button"/> - <image filename="inactive-close-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="inactive-close-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="close" state="pressed"> <draw_ops> <include name="inactive_button_pressed"/> - <image filename="inactive-close-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="inactive-close-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="close" state="prelight"> <draw_ops> <include name="inactive_button_prelight"/> - <image filename="inactive-close-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="inactive-close-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="minimize" state="normal"> <draw_ops> <include name="inactive_button"/> - <image filename="inactive-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="inactive-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="minimize" state="pressed"> <draw_ops> <include name="inactive_button_pressed"/> - <image filename="inactive-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="inactive-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="minimize" state="prelight"> <draw_ops> <include name="inactive_button_prelight"/> - <image filename="inactive-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="inactive-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="maximize" state="normal"> <draw_ops> <include name="inactive_button"/> - <image filename="inactive-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="inactive-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="maximize" state="pressed"> <draw_ops> <include name="inactive_button_pressed"/> - <image filename="inactive-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="inactive-maximize-button.png" x="2" y="2" width="width - 4" height="height - 4"/> </draw_ops> </button> <button function="maximize" state="prelight"> <draw_ops> <include name="inactive_button_prelight"/> - <image filename="inactive-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="inactive-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="menu" state="normal"> <draw_ops> - <image filename="inactive-menu-button.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="pressed"> <draw_ops> - <image filename="inactive-menu-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="inactive-menu-button-pressed.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="prelight"> <draw_ops> - <image filename="inactive-menu-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image filename="inactive-menu-button-prelight.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> </frame_style> @@ -258,38 +254,36 @@ <piece position="titlebar"> <draw_ops> + <image filename="active-left-top-border.png" colorize="gtk:bg[SELECTED]" - x="0" y="3" width="object_width" height="height"/> - <image filename="active-top-left-border.png" - colorize="gtk:bg[SELECTED]" - x="0" y="0" width="object_width" height="object_height"/> + x="0" y="0" width="object_width" height="height"/> - <image filename="active-top-right-border.png" - x="width - object_width" y="0" width="object_width" height="object_height"/> <image filename="active-right-top-border.png" - x="width - object_width" y="3" width="object_width" height="object_height"/> + x="width - object_width" y="0" width="object_width" height="height"/> <image filename="active-top-center-left.png" colorize="gtk:bg[SELECTED]" x="4" y="0" width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" - height="object_height"/> + height="height"/> <image filename="active-top-center-mid-left.png" colorize="gtk:bg[SELECTED]" - x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1" - y="0" width="object_width" height="object_height"/> + x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1" + y="0" width="object_width * height / 22" height="height"/> + <image filename="active-top-center-mid-right.png" - x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1" - y="0" width="object_width" height="object_height"/> + x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1" + y="0" width="object_width * height / 22" height="height"/> <image filename="active-top-center-right.png" - x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth) `min` (width - 3 * ButtonWidth - right_width)) + 1" + x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth * height / 22) `min` (width - 3 * ButtonWidth - right_width)) + 1" y="0" - width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)" - height="object_height"/> + width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth * height / 22 - right_width) `max` (3 * ButtonWidth)" + height="height"/> + </draw_ops> </piece> @@ -327,80 +321,80 @@ <button function="close" state="normal"> <draw_ops> <include name="active_button"/> - <image filename="active-close-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="active-close-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="close" state="pressed"> <draw_ops> <include name="active_button_pressed"/> - <image filename="active-close-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="active-close-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="close" state="prelight"> <draw_ops> <include name="active_button_prelight"/> - <image filename="active-close-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="active-close-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="minimize" state="normal"> <draw_ops> <include name="active_button"/> - <image filename="active-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="active-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="minimize" state="pressed"> <draw_ops> <include name="active_button_pressed"/> - <image filename="active-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="active-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="minimize" state="prelight"> <draw_ops> <include name="active_button_prelight"/> - <image filename="active-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="active-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="maximize" state="normal"> <draw_ops> <include name="active_button"/> - <image filename="active-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="active-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="maximize" state="pressed"> <draw_ops> <include name="active_button_pressed"/> - <image filename="active-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="active-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="maximize" state="prelight"> <draw_ops> <include name="active_button_prelight"/> - <image filename="active-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/> + <image filename="active-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/> </draw_ops> </button> <button function="menu" state="normal"> <draw_ops> - <image colorize="gtk:bg[SELECTED]" filename="active-menu-button.png" x="0" y="0" width="object_width" height="object_height"/> + <image colorize="gtk:bg[SELECTED]" filename="active-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="pressed"> <draw_ops> - <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/> + <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-pressed.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="prelight"> <draw_ops> - <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/> + <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-prelight.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> </frame_style> diff --git a/src/themes/Gorilla/active-button.png b/src/themes/Gorilla/active-button.png index a299ddb23..64455b330 100644 Binary files a/src/themes/Gorilla/active-button.png and b/src/themes/Gorilla/active-button.png differ diff --git a/src/themes/Gorilla/active-close-button.png b/src/themes/Gorilla/active-close-button.png index b77f77ae1..1d2921657 100644 Binary files a/src/themes/Gorilla/active-close-button.png and b/src/themes/Gorilla/active-close-button.png differ diff --git a/src/themes/Gorilla/active-close-menu-icon.png b/src/themes/Gorilla/active-close-menu-icon.png new file mode 100644 index 000000000..b77f77ae1 Binary files /dev/null and b/src/themes/Gorilla/active-close-menu-icon.png differ diff --git a/src/themes/Gorilla/active-maximize-button.png b/src/themes/Gorilla/active-maximize-button.png index 02ccc37a2..a982e5cb4 100644 Binary files a/src/themes/Gorilla/active-maximize-button.png and b/src/themes/Gorilla/active-maximize-button.png differ diff --git a/src/themes/Gorilla/active-maximize-menu-icon.png b/src/themes/Gorilla/active-maximize-menu-icon.png new file mode 100644 index 000000000..02ccc37a2 Binary files /dev/null and b/src/themes/Gorilla/active-maximize-menu-icon.png differ diff --git a/src/themes/Gorilla/active-menu-button.png b/src/themes/Gorilla/active-menu-button.png index aa12b497a..b55d7078e 100644 Binary files a/src/themes/Gorilla/active-menu-button.png and b/src/themes/Gorilla/active-menu-button.png differ diff --git a/src/themes/Gorilla/active-minimize-button.png b/src/themes/Gorilla/active-minimize-button.png index 292769297..4205f4e82 100644 Binary files a/src/themes/Gorilla/active-minimize-button.png and b/src/themes/Gorilla/active-minimize-button.png differ diff --git a/src/themes/Gorilla/active-minimize-menu-icon.png b/src/themes/Gorilla/active-minimize-menu-icon.png new file mode 100644 index 000000000..292769297 Binary files /dev/null and b/src/themes/Gorilla/active-minimize-menu-icon.png differ diff --git a/src/themes/Gorilla/inactive-close-button.png b/src/themes/Gorilla/inactive-close-button.png index 863599215..c566b12f2 100644 Binary files a/src/themes/Gorilla/inactive-close-button.png and b/src/themes/Gorilla/inactive-close-button.png differ diff --git a/src/themes/Gorilla/inactive-maximize-button.png b/src/themes/Gorilla/inactive-maximize-button.png index 4e8929999..9c838823c 100644 Binary files a/src/themes/Gorilla/inactive-maximize-button.png and b/src/themes/Gorilla/inactive-maximize-button.png differ diff --git a/src/themes/Gorilla/inactive-menu-button.png b/src/themes/Gorilla/inactive-menu-button.png index 99476b747..b000a3789 100644 Binary files a/src/themes/Gorilla/inactive-menu-button.png and b/src/themes/Gorilla/inactive-menu-button.png differ diff --git a/src/themes/Gorilla/inactive-minimize-button.png b/src/themes/Gorilla/inactive-minimize-button.png index 125aa6f7d..4459af4e5 100644 Binary files a/src/themes/Gorilla/inactive-minimize-button.png and b/src/themes/Gorilla/inactive-minimize-button.png differ diff --git a/src/themes/Gorilla/metacity-theme-1.xml b/src/themes/Gorilla/metacity-theme-1.xml index fd9290fc3..7dde366ae 100644 --- a/src/themes/Gorilla/metacity-theme-1.xml +++ b/src/themes/Gorilla/metacity-theme-1.xml @@ -18,32 +18,15 @@ <distance name="bottom_height" value="6"/> <distance name="left_titlebar_edge" value="8"/> <distance name="right_titlebar_edge" value="8"/> - <distance name="button_width" value="18"/> - <distance name="button_height" value="18"/> + <aspect_ratio name="button" value="1.0"/> <distance name="title_vertical_pad" value="0"/> - <border name="title_border" left="0" right="0" top="4" bottom="0"/> - <border name="button_border" left="0" right="0" top="8" bottom="0"/> + <border name="title_border" left="0" right="0" top="7" bottom="4"/> + <border name="button_border" left="0" right="0" top="9" bottom="0"/> </frame_geometry> <!-- Buttons --> -<draw_ops name="active_button"> - <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - -<draw_ops name="active_button_pressed"> - <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - -<draw_ops name="inactive_button"> - <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - -<draw_ops name="inactive_button_pressed"> - <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/> -</draw_ops> - <draw_ops name="title_tile"> <line color="#494d59" x1="0" y1="0" x2="width" y2="0"/> <line color="#515961" x1="0" y1="1" x2="width" y2="1"/> @@ -58,82 +41,73 @@ <rectangle color="light gray" x="4" y="4" width="width - 9" height="height - 8" filled="false"/> <rectangle color="light gray" x="5" y="5" width="width - 11" height="height - 10" filled="false"/> <rectangle color="white" x="6" y="6" width="width - 13" height="height - 12" filled="false"/> - <rectangle color="gray" x="6" y="6" width="width - 12" height="height - 12" filled="true"/> + <rectangle color="gtk:bg[INSENSITIVE]" x="6" y="6" width="width - 12" height="height - 12" filled="true"/> - <line color="gray" x1="1" y1="1" x2="2" y2="2"/> - <line color="gray" x1="1" y1="height - 2" x2="1" y2="height"/> - <line color="gray" x1="width - 2" y1="1" x2="width - 1" y2="2"/> - <line color="gray" x1="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/> + <line color="gtk:bg[INSENSITIVE]" x1="1" y1="1" x2="2" y2="2"/> + <line color="gtk:bg[INSENSITIVE]" x1="1" y1="height - 2" x2="1" y2="height"/> + <line color="gtk:bg[INSENSITIVE]" x1="width - 2" y1="1" x2="width - 1" y2="2"/> + <line color="gtk:bg[INSENSITIVE]" x1="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/> </draw_ops> </piece> <piece position="title"> <draw_ops> - <title color="gray" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/> + <title color="gray" x="IconTitleSpacing" y="0"/> </draw_ops> </piece> <piece position="titlebar"> - <draw_ops> - <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/> - <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/> + <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/> + <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/> </draw_ops> </piece> <button function="close" state="normal"> <draw_ops> - <include name="inactive_button"/> - <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="close" state="pressed"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="minimize" state="normal"> <draw_ops> - <include name="inactive_button"/> - <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="minimize" state="pressed"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="maximize" state="normal"> <draw_ops> - <include name="inactive_button"/> - <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="maximize" state="pressed"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="normal"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="pressed"> <draw_ops> - <include name="inactive_button_pressed"/> - <image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> @@ -155,81 +129,73 @@ <rectangle color="light gray" x="4" y="4" width="width - 9" height="height - 8" filled="false"/> <rectangle color="light gray" x="5" y="5" width="width - 11" height="height - 10" filled="false"/> <rectangle color="white" x="6" y="6" width="width - 13" height="height - 12" filled="false"/> - <rectangle color="gray" x="6" y="6" width="width - 12" height="height - 12" filled="true"/> + <rectangle color="gtk:bg[NORMAL]" x="6" y="6" width="width - 12" height="height - 12" filled="true"/> - <line color="gray" x1="0" y1="0" x2="1" y2="1"/> - <line color="gray" x1="0" y1="height - 1" x2="1" y2="height"/> - <line color="gray" x1="width - 1" y1="0" x2="width" y2="1"/> - <line color="gray" x1="width" y1="height" x2="width - 1" y2="height - 1"/> + <line color="gtk:bg[NORMAL]" x1="0" y1="0" x2="1" y2="1"/> + <line color="gtk:bg[NORMAL]" x1="0" y1="height - 1" x2="1" y2="height"/> + <line color="gtk:bg[NORMAL]" x1="width - 1" y1="0" x2="width" y2="1"/> + <line color="gtk:bg[NORMAL]" x1="width" y1="height" x2="width - 1" y2="height - 1"/> </draw_ops> </piece> <piece position="title"> <draw_ops> - <title color="white" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/> + <title color="white" x="IconTitleSpacing" y="0"/> </draw_ops> </piece> <piece position="titlebar"> <draw_ops> - <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/> - <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/> + <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/> + <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/> </draw_ops> </piece> <button function="close" state="normal"> <draw_ops> - <include name="active_button"/> - <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="close" state="pressed"> <draw_ops> - <include name="active_button_pressed"/> - <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="minimize" state="normal"> <draw_ops> - <include name="active_button"/> - <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="minimize" state="pressed"> <draw_ops> - <include name="active_button_pressed"/> - <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="maximize" state="normal"> <draw_ops> - <include name="active_button"/> - <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="maximize" state="pressed"> <draw_ops> - <include name="active_button_pressed"/> - <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="normal"> <draw_ops> - <include name="active_button"/> - <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> <button function="menu" state="pressed"> <draw_ops> - <include name="active_button_pressed"/> - <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/> + <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/> </draw_ops> </button> @@ -256,10 +222,11 @@ <window type="modal_dialog" style_set="normal"/> <window type="menu" style_set="normal"/> <window type="utility" style_set="normal"/> +<window type="border" style_set="normal"/> <menu_icon function="maximize" state="normal"> <draw_ops> - <image filename="active-maximize-button.png" + <image filename="active-maximize-menu-icon.png" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height"/> @@ -269,7 +236,7 @@ <menu_icon function="close" state="normal"> <draw_ops> - <image filename="active-close-button.png" + <image filename="active-close-menu-icon.png" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height"/> @@ -278,7 +245,7 @@ <menu_icon function="minimize" state="normal"> <draw_ops> - <image filename="active-minimize-button.png" + <image filename="active-minimize-menu-icon.png" x="(width - object_width) / 2" y="(height - object_height) / 2" width="object_width" height="object_height"/> diff --git a/src/themes/Makefile.am b/src/themes/Makefile.am index 737913227..6e5845fda 100644 --- a/src/themes/Makefile.am +++ b/src/themes/Makefile.am @@ -2,7 +2,8 @@ THEMES= \ Atlanta \ Bright \ Crux \ - Esco + Esco \ + Gorilla THEME_DIR=$(pkgdatadir)/themes