put Gorilla back in the build

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

View File

@ -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 <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>
* src/keybindings.c (meta_display_process_key_event): handle

View File

@ -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;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 844 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 896 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 886 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 919 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 903 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 900 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 927 B

View File

@ -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"/>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 B

After

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 161 B

After

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 436 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 B

After

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 859 B

After

Width:  |  Height:  |  Size: 902 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 153 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 379 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 B

After

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 410 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 375 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 374 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 143 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 181 B

View File

@ -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>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 844 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 896 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 886 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 919 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 903 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 900 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 927 B

View File

@ -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"/>

View File

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