isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

put Gorilla back in the build

Browse Source 
2002-07-23  Havoc Pennington  <hp@redhat.com>

	* 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)
This commit is contained in:
Havoc Pennington 2002-07-24 02:21:24 +00:00 committed by Havoc Pennington
parent 5975c80270
commit f7b55bfdcc
62 changed files with 153 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -3,6 +3,18 @@
* src/menu.c (meta_window_menu_new): Use the real workspace names * src/menu.c (meta_window_menu_new): Use the real workspace names
instead of making up numbers. instead of making up numbers.
2002-07-23 Havoc Pennington <hp@redhat.com>
* 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 <hp@redhat.com> 2002-07-23 Havoc Pennington <hp@redhat.com>
* src/keybindings.c (meta_display_process_key_event): handle * src/keybindings.c (meta_display_process_key_event): handle

6
src/frames.c
View File

@ -1755,6 +1755,7 @@ control_rect (MetaFrameControl control,
} }
#define RESIZE_EXTENDS 15 #define RESIZE_EXTENDS 15
#define TOP_RESIZE_HEIGHT 2
static MetaFrameControl static MetaFrameControl
get_control (MetaFrames *frames, get_control (MetaFrames *frames,
MetaUIFrame *frame, MetaUIFrame *frame,
@ -1805,9 +1806,6 @@ get_control (MetaFrames *frames,
int bottom_of_titlebar; int bottom_of_titlebar;
bottom_of_titlebar = fgeom.title_rect.y + fgeom.title_rect.height; 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, /* South resize always has priority over north resize,
* in case of overlap. * in case of overlap.
@ -1858,7 +1856,7 @@ get_control (MetaFrames *frames,
if (has_vert) if (has_vert)
return META_FRAME_CONTROL_RESIZE_S; 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) if (has_vert)
return META_FRAME_CONTROL_RESIZE_N; return META_FRAME_CONTROL_RESIZE_N;

BIN
src/themes/AgingGorilla/active-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 844 B

BIN
src/themes/AgingGorilla/active-close-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 896 B

BIN
src/themes/AgingGorilla/active-close-menu-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 258 B

BIN
src/themes/AgingGorilla/active-maximize-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 886 B

BIN
src/themes/AgingGorilla/active-maximize-menu-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

BIN
src/themes/AgingGorilla/active-menu-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 873 B

BIN
src/themes/AgingGorilla/active-minimize-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 914 B

BIN
src/themes/AgingGorilla/active-minimize-menu-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 332 B

BIN
src/themes/AgingGorilla/inactive-close-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 919 B

BIN
src/themes/AgingGorilla/inactive-maximize-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 903 B

BIN
src/themes/AgingGorilla/inactive-menu-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 900 B

BIN
src/themes/AgingGorilla/inactive-minimize-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 927 B

111
src/themes/AgingGorilla/metacity-theme-1.xml
View File

@ -18,32 +18,15 @@
<distance name="bottom_height" value="6"/> <distance name="bottom_height" value="6"/>
<distance name="left_titlebar_edge" value="8"/> <distance name="left_titlebar_edge" value="8"/>
<distance name="right_titlebar_edge" value="8"/> <distance name="right_titlebar_edge" value="8"/>
<distance name="button_width" value="18"/> <aspect_ratio name="button" value="1.0"/>
<distance name="button_height" value="18"/>
<distance name="title_vertical_pad" value="0"/> <distance name="title_vertical_pad" value="0"/>
<border name="title_border" left="0" right="0" top="4" bottom="0"/> <border name="title_border" left="0" right="0" top="7" bottom="4"/>
<border name="button_border" left="0" right="0" top="8" bottom="0"/> <border name="button_border" left="0" right="0" top="9" bottom="0"/>
</frame_geometry> </frame_geometry>
<!-- Buttons --> <!-- 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"> <draw_ops name="title_tile">
<line color="#494d59" x1="0" y1="0" x2="width" y2="0"/> <line color="#494d59" x1="0" y1="0" x2="width" y2="0"/>
<line color="#515961" x1="0" y1="1" x2="width" y2="1"/> <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="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="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="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="gtk:bg[INSENSITIVE]" x1="1" y1="1" x2="2" y2="2"/>
<line color="gray" x1="1" y1="height - 2" x2="1" y2="height"/> <line color="gtk:bg[INSENSITIVE]" x1="1" y1="height - 2" x2="1" y2="height"/>
<line color="gray" x1="width - 2" y1="1" x2="width - 1" y2="2"/> <line color="gtk:bg[INSENSITIVE]" 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="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/>
</draw_ops> </draw_ops>
</piece> </piece>
<piece position="title"> <piece position="title">
<draw_ops> <draw_ops>
<title color="gray" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/> <title color="gray" x="IconTitleSpacing" y="0"/>
</draw_ops> </draw_ops>
</piece> </piece>
<piece position="titlebar"> <piece position="titlebar">
<draw_ops> <draw_ops>
<rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/> <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="12"/> <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
</draw_ops> </draw_ops>
</piece> </piece>
<button function="close" state="normal"> <button function="close" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button"/> <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="close" state="pressed"> <button function="close" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="minimize" state="normal"> <button function="minimize" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button"/> <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="minimize" state="pressed"> <button function="minimize" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="maximize" state="normal"> <button function="maximize" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button"/> <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="maximize" state="pressed"> <button function="maximize" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="menu" state="normal"> <button function="menu" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="menu" state="pressed"> <button function="menu" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </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="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="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="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="gtk:bg[NORMAL]" x1="0" y1="0" x2="1" y2="1"/>
<line color="gray" x1="0" y1="height - 1" x2="1" y2="height"/> <line color="gtk:bg[NORMAL]" x1="0" y1="height - 1" x2="1" y2="height"/>
<line color="gray" x1="width - 1" y1="0" x2="width" y2="1"/> <line color="gtk:bg[NORMAL]" 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="width" y1="height" x2="width - 1" y2="height - 1"/>
</draw_ops> </draw_ops>
</piece> </piece>
<piece position="title"> <piece position="title">
<draw_ops> <draw_ops>
<title color="white" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/> <title color="white" x="IconTitleSpacing" y="0"/>
</draw_ops> </draw_ops>
</piece> </piece>
<piece position="titlebar"> <piece position="titlebar">
<draw_ops> <draw_ops>
<rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/> <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="12"/> <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
</draw_ops> </draw_ops>
</piece> </piece>
<button function="close" state="normal"> <button function="close" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="close" state="pressed"> <button function="close" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="minimize" state="normal"> <button function="minimize" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="minimize" state="pressed"> <button function="minimize" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="maximize" state="normal"> <button function="maximize" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="maximize" state="pressed"> <button function="maximize" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="menu" state="normal"> <button function="menu" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="menu" state="pressed"> <button function="menu" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
@ -256,10 +222,11 @@
<window type="modal_dialog" style_set="normal"/> <window type="modal_dialog" style_set="normal"/>
<window type="menu" style_set="normal"/> <window type="menu" style_set="normal"/>
<window type="utility" style_set="normal"/> <window type="utility" style_set="normal"/>
<window type="border" style_set="normal"/>
<menu_icon function="maximize" state="normal"> <menu_icon function="maximize" state="normal">
<draw_ops> <draw_ops>
<image filename="active-maximize-button.png" <image filename="active-maximize-menu-icon.png"
x="(width - object_width) / 2" x="(width - object_width) / 2"
y="(height - object_height) / 2" y="(height - object_height) / 2"
width="object_width" height="object_height"/> width="object_width" height="object_height"/>
@ -269,7 +236,7 @@
<menu_icon function="close" state="normal"> <menu_icon function="close" state="normal">
<draw_ops> <draw_ops>
<image filename="active-close-button.png" <image filename="active-close-menu-icon.png"
x="(width - object_width) / 2" x="(width - object_width) / 2"
y="(height - object_height) / 2" y="(height - object_height) / 2"
width="object_width" height="object_height"/> width="object_width" height="object_height"/>
@ -278,7 +245,7 @@
<menu_icon function="minimize" state="normal"> <menu_icon function="minimize" state="normal">
<draw_ops> <draw_ops>
<image filename="active-minimize-button.png" <image filename="active-minimize-menu-icon.png"
x="(width - object_width) / 2" x="(width - object_width) / 2"
y="(height - object_height) / 2" y="(height - object_height) / 2"
width="object_width" height="object_height"/> width="object_width" height="object_height"/>

BIN
src/themes/Crux/active-border-top-left-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 176 B

After

Width:  |  Height:  |  Size: 147 B

BIN
src/themes/Crux/active-border-top-right-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 147 B

BIN
src/themes/Crux/active-bottom-left-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 147 B

BIN
src/themes/Crux/active-bottom-right-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 150 B

BIN
src/themes/Crux/active-button-prelight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 385 B

BIN
src/themes/Crux/active-button-pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 391 B

BIN
src/themes/Crux/active-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 396 B

BIN
src/themes/Crux/active-left-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 139 B

BIN
src/themes/Crux/active-left-top-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 161 B

After

Width:  |  Height:  |  Size: 235 B

BIN
src/themes/Crux/active-menu-button-prelight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 455 B

BIN
src/themes/Crux/active-menu-button-pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 424 B

BIN
src/themes/Crux/active-menu-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 436 B

BIN
src/themes/Crux/active-right-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 166 B

After

Width:  |  Height:  |  Size: 142 B

BIN
src/themes/Crux/active-right-top-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 300 B

BIN
src/themes/Crux/active-top-center-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 176 B

BIN
src/themes/Crux/active-top-center-mid-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 859 B

After

Width:  |  Height:  |  Size: 902 B

BIN
src/themes/Crux/inactive-border-top-left-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 153 B

BIN
src/themes/Crux/inactive-border-top-right-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 154 B

BIN
src/themes/Crux/inactive-bottom-left-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 148 B

BIN
src/themes/Crux/inactive-bottom-right-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 148 B

BIN
src/themes/Crux/inactive-button-prelight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 357 B

BIN
src/themes/Crux/inactive-button-pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 379 B

BIN
src/themes/Crux/inactive-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 376 B

After

Width:  |  Height:  |  Size: 390 B

BIN
src/themes/Crux/inactive-left-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 162 B

After

Width:  |  Height:  |  Size: 140 B

BIN
src/themes/Crux/inactive-left-top-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 195 B

BIN
src/themes/Crux/inactive-menu-button-prelight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 410 B

BIN
src/themes/Crux/inactive-menu-button-pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 375 B

BIN
src/themes/Crux/inactive-menu-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 374 B

BIN
src/themes/Crux/inactive-right-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 143 B

BIN
src/themes/Crux/inactive-right-top-border.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 279 B

BIN
src/themes/Crux/inactive-top-center-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 165 B

BIN
src/themes/Crux/inactive-top-center-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 181 B

124
src/themes/Crux/metacity-theme-1.xml
View File

@ -19,11 +19,10 @@
<distance name="bottom_height" value="6"/> <distance name="bottom_height" value="6"/>
<distance name="left_titlebar_edge" value="5"/> <distance name="left_titlebar_edge" value="5"/>
<distance name="right_titlebar_edge" value="6"/> <distance name="right_titlebar_edge" value="6"/>
<distance name="button_width" value="16"/> <aspect_ratio name="button" value="1.0"/>
<distance name="button_height" value="16"/> <distance name="title_vertical_pad" value="0"/>
<distance name="title_vertical_pad" value="6"/> <border name="title_border" left="0" right="0" top="3" bottom="3"/>
<border name="title_border" left="0" right="0" top="0" bottom="0"/> <border name="button_border" left="0" right="0" top="3" bottom="3"/>
<border name="button_border" left="0" right="0" top="0" bottom="0"/>
</frame_geometry> </frame_geometry>
<frame_geometry name="border" has_title="false"> <frame_geometry name="border" has_title="false">
@ -34,7 +33,7 @@
<distance name="right_titlebar_edge" value="0"/> <distance name="right_titlebar_edge" value="0"/>
<distance name="button_width" value="0"/> <distance name="button_width" value="0"/>
<distance name="button_height" 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="title_border" left="0" right="0" top="0" bottom="0"/>
<border name="button_border" left="0" right="0" top="0" bottom="0"/> <border name="button_border" left="0" right="0" top="0" bottom="0"/>
</frame_geometry> </frame_geometry>
@ -42,27 +41,27 @@
<!-- Buttons --> <!-- Buttons -->
<draw_ops name="active_button"> <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>
<draw_ops name="active_button_pressed"> <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>
<draw_ops name="active_button_prelight"> <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>
<draw_ops name="inactive_button"> <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>
<draw_ops name="inactive_button_pressed"> <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>
<draw_ops name="inactive_button_prelight"> <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> </draw_ops>
<!-- Inactive style --> <!-- Inactive style -->
@ -81,37 +80,34 @@
<piece position="title"> <piece position="title">
<draw_ops> <draw_ops>
<title color="white" x="IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/> <title color="white" x="IconTitleSpacing" y="0"/>
</draw_ops> </draw_ops>
</piece> </piece>
<piece position="titlebar"> <piece position="titlebar">
<draw_ops> <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" <image filename="inactive-left-top-border.png"
x="width - object_width" y="0" width="object_width" height="object_height"/> x="0" y="0" width="object_width" height="height"/>
<image filename="inactive-right-top-border.png" <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" <image filename="inactive-top-center-left.png"
x="4" y="0" x="4" y="0"
width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min` width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min`
(width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)"
height="object_height"/> height="height"/>
<image filename="inactive-top-center-mid.png" <image filename="inactive-top-center-mid.png"
x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1" x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
y="0" width="object_width" height="object_height"/> y="0" width="object_width * height / 22" height="height"/>
<image filename="inactive-top-center-right.png" <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" y="0"
width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)" width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth * height / 22 - right_width) `max` (3 * ButtonWidth)"
height="object_height"/> height="height"/>
</draw_ops> </draw_ops>
</piece> </piece>
@ -143,80 +139,80 @@
<button function="close" state="normal"> <button function="close" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button"/> <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> </draw_ops>
</button> </button>
<button function="close" state="pressed"> <button function="close" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <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> </draw_ops>
</button> </button>
<button function="close" state="prelight"> <button function="close" state="prelight">
<draw_ops> <draw_ops>
<include name="inactive_button_prelight"/> <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> </draw_ops>
</button> </button>
<button function="minimize" state="normal"> <button function="minimize" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button"/> <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> </draw_ops>
</button> </button>
<button function="minimize" state="pressed"> <button function="minimize" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <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> </draw_ops>
</button> </button>
<button function="minimize" state="prelight"> <button function="minimize" state="prelight">
<draw_ops> <draw_ops>
<include name="inactive_button_prelight"/> <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> </draw_ops>
</button> </button>
<button function="maximize" state="normal"> <button function="maximize" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button"/> <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> </draw_ops>
</button> </button>
<button function="maximize" state="pressed"> <button function="maximize" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <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> </draw_ops>
</button> </button>
<button function="maximize" state="prelight"> <button function="maximize" state="prelight">
<draw_ops> <draw_ops>
<include name="inactive_button_prelight"/> <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> </draw_ops>
</button> </button>
<button function="menu" state="normal"> <button function="menu" state="normal">
<draw_ops> <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> </draw_ops>
</button> </button>
<button function="menu" state="pressed"> <button function="menu" state="pressed">
<draw_ops> <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> </draw_ops>
</button> </button>
<button function="menu" state="prelight"> <button function="menu" state="prelight">
<draw_ops> <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> </draw_ops>
</button> </button>
</frame_style> </frame_style>
@ -258,38 +254,36 @@
<piece position="titlebar"> <piece position="titlebar">
<draw_ops> <draw_ops>
<image filename="active-left-top-border.png" <image filename="active-left-top-border.png"
colorize="gtk:bg[SELECTED]" colorize="gtk:bg[SELECTED]"
x="0" y="3" width="object_width" height="height"/> x="0" y="0" 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"/>
<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" <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" <image filename="active-top-center-left.png"
colorize="gtk:bg[SELECTED]" colorize="gtk:bg[SELECTED]"
x="4" y="0" x="4" y="0"
width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min` width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min`
(width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)"
height="object_height"/> height="height"/>
<image filename="active-top-center-mid-left.png" <image filename="active-top-center-mid-left.png"
colorize="gtk:bg[SELECTED]" colorize="gtk:bg[SELECTED]"
x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1" x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
y="0" width="object_width" height="object_height"/> y="0" width="object_width * height / 22" height="height"/>
<image filename="active-top-center-mid-right.png" <image filename="active-top-center-mid-right.png"
x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1" x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
y="0" width="object_width" height="object_height"/> y="0" width="object_width * height / 22" height="height"/>
<image filename="active-top-center-right.png" <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" y="0"
width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)" width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth * height / 22 - right_width) `max` (3 * ButtonWidth)"
height="object_height"/> height="height"/>
</draw_ops> </draw_ops>
</piece> </piece>
@ -327,80 +321,80 @@
<button function="close" state="normal"> <button function="close" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <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> </draw_ops>
</button> </button>
<button function="close" state="pressed"> <button function="close" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <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> </draw_ops>
</button> </button>
<button function="close" state="prelight"> <button function="close" state="prelight">
<draw_ops> <draw_ops>
<include name="active_button_prelight"/> <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> </draw_ops>
</button> </button>
<button function="minimize" state="normal"> <button function="minimize" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <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> </draw_ops>
</button> </button>
<button function="minimize" state="pressed"> <button function="minimize" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <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> </draw_ops>
</button> </button>
<button function="minimize" state="prelight"> <button function="minimize" state="prelight">
<draw_ops> <draw_ops>
<include name="active_button_prelight"/> <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> </draw_ops>
</button> </button>
<button function="maximize" state="normal"> <button function="maximize" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <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> </draw_ops>
</button> </button>
<button function="maximize" state="pressed"> <button function="maximize" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <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> </draw_ops>
</button> </button>
<button function="maximize" state="prelight"> <button function="maximize" state="prelight">
<draw_ops> <draw_ops>
<include name="active_button_prelight"/> <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> </draw_ops>
</button> </button>
<button function="menu" state="normal"> <button function="menu" state="normal">
<draw_ops> <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> </draw_ops>
</button> </button>
<button function="menu" state="pressed"> <button function="menu" state="pressed">
<draw_ops> <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> </draw_ops>
</button> </button>
<button function="menu" state="prelight"> <button function="menu" state="prelight">
<draw_ops> <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> </draw_ops>
</button> </button>
</frame_style> </frame_style>

BIN
src/themes/Gorilla/active-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 844 B

BIN
src/themes/Gorilla/active-close-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 896 B

BIN
src/themes/Gorilla/active-close-menu-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 258 B

BIN
src/themes/Gorilla/active-maximize-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 886 B

BIN
src/themes/Gorilla/active-maximize-menu-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

BIN
src/themes/Gorilla/active-menu-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 873 B

BIN
src/themes/Gorilla/active-minimize-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 914 B

BIN
src/themes/Gorilla/active-minimize-menu-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 332 B

BIN
src/themes/Gorilla/inactive-close-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 919 B

BIN
src/themes/Gorilla/inactive-maximize-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 903 B

BIN
src/themes/Gorilla/inactive-menu-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 900 B

BIN
src/themes/Gorilla/inactive-minimize-button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 927 B

111
src/themes/Gorilla/metacity-theme-1.xml
View File

@ -18,32 +18,15 @@
<distance name="bottom_height" value="6"/> <distance name="bottom_height" value="6"/>
<distance name="left_titlebar_edge" value="8"/> <distance name="left_titlebar_edge" value="8"/>
<distance name="right_titlebar_edge" value="8"/> <distance name="right_titlebar_edge" value="8"/>
<distance name="button_width" value="18"/> <aspect_ratio name="button" value="1.0"/>
<distance name="button_height" value="18"/>
<distance name="title_vertical_pad" value="0"/> <distance name="title_vertical_pad" value="0"/>
<border name="title_border" left="0" right="0" top="4" bottom="0"/> <border name="title_border" left="0" right="0" top="7" bottom="4"/>
<border name="button_border" left="0" right="0" top="8" bottom="0"/> <border name="button_border" left="0" right="0" top="9" bottom="0"/>
</frame_geometry> </frame_geometry>
<!-- Buttons --> <!-- 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"> <draw_ops name="title_tile">
<line color="#494d59" x1="0" y1="0" x2="width" y2="0"/> <line color="#494d59" x1="0" y1="0" x2="width" y2="0"/>
<line color="#515961" x1="0" y1="1" x2="width" y2="1"/> <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="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="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="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="gtk:bg[INSENSITIVE]" x1="1" y1="1" x2="2" y2="2"/>
<line color="gray" x1="1" y1="height - 2" x2="1" y2="height"/> <line color="gtk:bg[INSENSITIVE]" x1="1" y1="height - 2" x2="1" y2="height"/>
<line color="gray" x1="width - 2" y1="1" x2="width - 1" y2="2"/> <line color="gtk:bg[INSENSITIVE]" 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="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/>
</draw_ops> </draw_ops>
</piece> </piece>
<piece position="title"> <piece position="title">
<draw_ops> <draw_ops>
<title color="gray" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/> <title color="gray" x="IconTitleSpacing" y="0"/>
</draw_ops> </draw_ops>
</piece> </piece>
<piece position="titlebar"> <piece position="titlebar">
<draw_ops> <draw_ops>
<rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/> <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="12"/> <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
</draw_ops> </draw_ops>
</piece> </piece>
<button function="close" state="normal"> <button function="close" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button"/> <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="close" state="pressed"> <button function="close" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="minimize" state="normal"> <button function="minimize" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button"/> <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="minimize" state="pressed"> <button function="minimize" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="maximize" state="normal"> <button function="maximize" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button"/> <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="maximize" state="pressed"> <button function="maximize" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="menu" state="normal"> <button function="menu" state="normal">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="menu" state="pressed"> <button function="menu" state="pressed">
<draw_ops> <draw_ops>
<include name="inactive_button_pressed"/> <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
<image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </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="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="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="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="gtk:bg[NORMAL]" x1="0" y1="0" x2="1" y2="1"/>
<line color="gray" x1="0" y1="height - 1" x2="1" y2="height"/> <line color="gtk:bg[NORMAL]" x1="0" y1="height - 1" x2="1" y2="height"/>
<line color="gray" x1="width - 1" y1="0" x2="width" y2="1"/> <line color="gtk:bg[NORMAL]" 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="width" y1="height" x2="width - 1" y2="height - 1"/>
</draw_ops> </draw_ops>
</piece> </piece>
<piece position="title"> <piece position="title">
<draw_ops> <draw_ops>
<title color="white" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/> <title color="white" x="IconTitleSpacing" y="0"/>
</draw_ops> </draw_ops>
</piece> </piece>
<piece position="titlebar"> <piece position="titlebar">
<draw_ops> <draw_ops>
<rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/> <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="12"/> <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
</draw_ops> </draw_ops>
</piece> </piece>
<button function="close" state="normal"> <button function="close" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="close" state="pressed"> <button function="close" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="minimize" state="normal"> <button function="minimize" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="minimize" state="pressed"> <button function="minimize" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="maximize" state="normal"> <button function="maximize" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="maximize" state="pressed"> <button function="maximize" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="menu" state="normal"> <button function="menu" state="normal">
<draw_ops> <draw_ops>
<include name="active_button"/> <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
<button function="menu" state="pressed"> <button function="menu" state="pressed">
<draw_ops> <draw_ops>
<include name="active_button_pressed"/> <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
<image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
</draw_ops> </draw_ops>
</button> </button>
@ -256,10 +222,11 @@
<window type="modal_dialog" style_set="normal"/> <window type="modal_dialog" style_set="normal"/>
<window type="menu" style_set="normal"/> <window type="menu" style_set="normal"/>
<window type="utility" style_set="normal"/> <window type="utility" style_set="normal"/>
<window type="border" style_set="normal"/>
<menu_icon function="maximize" state="normal"> <menu_icon function="maximize" state="normal">
<draw_ops> <draw_ops>
<image filename="active-maximize-button.png" <image filename="active-maximize-menu-icon.png"
x="(width - object_width) / 2" x="(width - object_width) / 2"
y="(height - object_height) / 2" y="(height - object_height) / 2"
width="object_width" height="object_height"/> width="object_width" height="object_height"/>
@ -269,7 +236,7 @@
<menu_icon function="close" state="normal"> <menu_icon function="close" state="normal">
<draw_ops> <draw_ops>
<image filename="active-close-button.png" <image filename="active-close-menu-icon.png"
x="(width - object_width) / 2" x="(width - object_width) / 2"
y="(height - object_height) / 2" y="(height - object_height) / 2"
width="object_width" height="object_height"/> width="object_width" height="object_height"/>
@ -278,7 +245,7 @@
<menu_icon function="minimize" state="normal"> <menu_icon function="minimize" state="normal">
<draw_ops> <draw_ops>
<image filename="active-minimize-button.png" <image filename="active-minimize-menu-icon.png"
x="(width - object_width) / 2" x="(width - object_width) / 2"
y="(height - object_height) / 2" y="(height - object_height) / 2"
width="object_width" height="object_height"/> width="object_width" height="object_height"/>

3
src/themes/Makefile.am
View File

@ -2,7 +2,8 @@ THEMES= \
Atlanta \ Atlanta \
Bright \ Bright \
Crux \ Crux \
Esco Esco \
Gorilla
THEME_DIR=$(pkgdatadir)/themes THEME_DIR=$(pkgdatadir)/themes