Update for "border" frame stuff, minor button/spacing improvements.
2002-06-22 James M. Cape <jcape@ignore-your.tv> * src/themes/Esco/metacity-theme-1.xml: Update for "border" frame stuff, minor button/spacing improvements.
This commit is contained in:
James M. Cape
James M. Cape
parent
97b629ad5b
commit
6e577c12c1
2 changed files with 91 additions and 36 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2002-06-22 James M. Cape <jcape@ignore-your.tv>
|
||||
|
||||
* src/themes/Esco/metacity-theme-1.xml: Update for "border"
|
||||
frame stuff, minor button/spacing improvements.
|
||||
|
||||
2002-06-22 Havoc Pennington <hp@pobox.com>
|
||||
|
||||
Partially fix Jacob's SM bugs.
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
<distance name="right_titlebar_edge" value="5"/>
|
||||
<aspect_ratio name="button" value="1.0"/>
|
||||
<distance name="title_vertical_pad" value="3"/>
|
||||
<border name="title_border" left="3" right="3" top="4" bottom="3"/>
|
||||
<border name="button_border" left="0" right="1" top="6" bottom="5"/>
|
||||
<border name="title_border" left="3" right="3" top="4" bottom="4"/>
|
||||
<border name="button_border" left="0" right="0" top="5" bottom="5"/>
|
||||
</frame_geometry>
|
||||
|
||||
<!-- strip borders off the normal geometry -->
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
<distance name="bottom_height" value="0"/>
|
||||
<distance name="left_titlebar_edge" value="0"/>
|
||||
<distance name="right_titlebar_edge" value="0"/>
|
||||
<border name="title_border" left="3" right="3" top="2" bottom="3"/>
|
||||
<border name="button_border" left="0" right="0" top="0" bottom="0"/>
|
||||
<border name="title_border" left="3" right="3" top="0" bottom="3"/>
|
||||
<border name="button_border" left="0" right="0" top="0" bottom="3"/>
|
||||
</frame_geometry>
|
||||
|
||||
<frame_geometry name="utility" title_scale="xx-small">
|
||||
|
|
@ -44,6 +44,19 @@
|
|||
<border name="button_border" left="0" right="0" top="2" bottom="2"/>
|
||||
</frame_geometry>
|
||||
|
||||
<frame_geometry name="border" has_title="false">
|
||||
<distance name="left_width" value="5"/>
|
||||
<distance name="right_width" value="5"/>
|
||||
<distance name="bottom_height" value="5"/>
|
||||
<distance name="left_titlebar_edge" value="0"/>
|
||||
<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="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>
|
||||
|
||||
<!-- define constants -->
|
||||
<constant name="ArrowWidth" value="7"/>
|
||||
<constant name="ArrowHeight" value="5"/>
|
||||
|
|
@ -153,14 +166,14 @@
|
|||
height="height - (ButtonIPad * 2) - 1"/>
|
||||
<rectangle color="gtk:fg[INSENSITIVE]" filled="false"
|
||||
x="ButtonIPad"
|
||||
y="ButtonIPad + 3"
|
||||
width="width - (ButtonIPad * 2) - 1 - 3"
|
||||
height="height - (ButtonIPad * 2) - 1 - 3"/>
|
||||
y="ButtonIPad + 4"
|
||||
width="width - (ButtonIPad * 2) - 1 - 4"
|
||||
height="height - (ButtonIPad * 2) - 1 - 4"/>
|
||||
<line color="gtk:fg[INSENSITIVE]"
|
||||
x1="ButtonIPad"
|
||||
y1="ButtonIPad + 3 + 3"
|
||||
x2="width - (ButtonIPad * 2) - 2"
|
||||
y2="ButtonIPad + 3 + 3"/>
|
||||
y1="ButtonIPad + 3 + 4"
|
||||
x2="width - (ButtonIPad * 2) - 3"
|
||||
y2="ButtonIPad + 3 + 4"/>
|
||||
</draw_ops>
|
||||
<draw_ops name="restore_button_focused">
|
||||
<rectangle color="gtk:fg[INSENSITIVE]" filled="false"
|
||||
|
|
@ -170,19 +183,19 @@
|
|||
height="height - (ButtonIPad * 2) - 1"/>
|
||||
<rectangle color="gtk:fg[NORMAL]" filled="false"
|
||||
x="ButtonIPad"
|
||||
y="ButtonIPad + 3"
|
||||
width="width - (ButtonIPad * 2) - 1 - 3"
|
||||
height="height - (ButtonIPad * 2) - 1 - 3"/>
|
||||
y="ButtonIPad + 4"
|
||||
width="width - (ButtonIPad * 2) - 1 - 4"
|
||||
height="height - (ButtonIPad * 2) - 1 - 4"/>
|
||||
<line color="gtk:fg[NORMAL]"
|
||||
x1="ButtonIPad"
|
||||
y1="ButtonIPad + 3 + 3"
|
||||
x2="width - (ButtonIPad * 2) - 2"
|
||||
y2="ButtonIPad + 3 + 3"/>
|
||||
y1="ButtonIPad + 3 + 4"
|
||||
x2="width - (ButtonIPad * 2) - 3"
|
||||
y2="ButtonIPad + 3 + 4"/>
|
||||
<line color="gtk:fg[INSENSITIVE]" width="2"
|
||||
x1="ButtonIPad + 1"
|
||||
y1="ButtonIPad + 3 + 2"
|
||||
x2="width - (ButtonIPad * 2) - 1"
|
||||
y2="ButtonIPad + 3 + 2"/>
|
||||
y1="ButtonIPad + 4 + 2"
|
||||
x2="width - (ButtonIPad * 2) - 2"
|
||||
y2="ButtonIPad + 4 + 2"/>
|
||||
</draw_ops>
|
||||
|
||||
<draw_ops name="close_button_focused">
|
||||
|
|
@ -197,6 +210,16 @@
|
|||
y1="height - ButtonIPad - 2"
|
||||
x2="width - ButtonIPad - 2"
|
||||
y2="ButtonIPad + 1"/>
|
||||
<rectangle color="gtk:fg[NORMAL]" filled="false"
|
||||
x="width - ButtonIPad - 3"
|
||||
y="height - ButtonIPad - 3"
|
||||
width="1"
|
||||
height="1"/>
|
||||
<rectangle color="gtk:fg[NORMAL]" filled="false"
|
||||
x="width - ButtonIPad - 3"
|
||||
y="ButtonIPad + 1"
|
||||
width="1"
|
||||
height="1"/>
|
||||
</draw_ops>
|
||||
<draw_ops name="close_button">
|
||||
<line color="gtk:fg[INSENSITIVE]" width="2"
|
||||
|
|
@ -209,6 +232,16 @@
|
|||
y1="height - ButtonIPad - 2"
|
||||
x2="width - ButtonIPad - 2"
|
||||
y2="ButtonIPad + 1"/>
|
||||
<rectangle color="gtk:fg[INSENSITIVE]" filled="false"
|
||||
x="width - ButtonIPad - 3"
|
||||
y="height - ButtonIPad - 3"
|
||||
width="1"
|
||||
height="1"/>
|
||||
<rectangle color="gtk:fg[INSENSITIVE]" filled="false"
|
||||
x="width - ButtonIPad - 3"
|
||||
y="ButtonIPad + 1"
|
||||
width="1"
|
||||
height="1"/>
|
||||
</draw_ops>
|
||||
<!-- End Buttons Icons -->
|
||||
|
||||
|
|
@ -244,7 +277,7 @@
|
|||
</draw_ops>
|
||||
|
||||
<draw_ops name="restore_button_normal">
|
||||
<include name="button_pressed_bg"/>
|
||||
<include name="button_normal_bg"/>
|
||||
<include name="restore_button_focused"/>
|
||||
</draw_ops>
|
||||
|
||||
|
|
@ -446,6 +479,11 @@
|
|||
<piece position="title" draw_ops="title_utility_focused"/>
|
||||
</frame_style>
|
||||
|
||||
<frame_style name="border" geometry="border" parent="normal_unfocused">
|
||||
<piece position="entire_background" draw_ops="outer_bevel"/>
|
||||
<piece position="title" draw_ops="blank"/>
|
||||
</frame_style>
|
||||
|
||||
<frame_style_set name="normal">
|
||||
<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
|
||||
<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
|
||||
|
|
@ -469,11 +507,23 @@
|
|||
<frame focus="no" state="maximized_and_shaded" style="utility_unfocused"/>
|
||||
</frame_style_set>
|
||||
|
||||
<frame_style_set name="border">
|
||||
<frame focus="yes" state="normal" resize="both" style="border"/>
|
||||
<frame focus="no" state="normal" resize="both" style="border"/>
|
||||
<frame focus="yes" state="maximized" style="border"/>
|
||||
<frame focus="no" state="maximized" style="border"/>
|
||||
<frame focus="yes" state="shaded" style="border"/>
|
||||
<frame focus="no" state="shaded" style="border"/>
|
||||
<frame focus="yes" state="maximized_and_shaded" style="border"/>
|
||||
<frame focus="no" state="maximized_and_shaded" style="border"/>
|
||||
</frame_style_set>
|
||||
|
||||
<window type="normal" style_set="normal"/>
|
||||
<window type="dialog" style_set="normal"/>
|
||||
<window type="modal_dialog" style_set="normal"/>
|
||||
<window type="menu" style_set="normal"/>
|
||||
<window type="utility" style_set="utility"/>
|
||||
<window type="border" style_set="border"/>
|
||||
|
||||
<menu_icon function="close" state="normal"
|
||||
draw_ops="close_button_focused"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue