Crux tweaks: adds a Restore button for maximized windows, and un-hard-codes

titlebar text colors. Fixes #97759.
This commit is contained in:
Calum Benson 2002-11-05 19:38:12 +00:00
parent a64b868dbd
commit 6c18374142
4 changed files with 74 additions and 18 deletions

View File

@ -1,3 +1,11 @@
2002-11-05 Calum Benson <calum.benson@sun.com>
* src/themes/Crux/active-restore-button.png:
* src/themes/Crux/inactive-restore-button.png:
* src/themes/Crux/metacity-theme-1.xml: add a restore button
for maximized windows, and un-hard-code titlebar text colors.
Fixes #97759.
2002-11-05 Havoc Pennington <hp@redhat.com>
* src/workspace.c (meta_workspace_get_neighbor): apply patch from

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 249 B

View File

@ -80,7 +80,7 @@
<piece position="title">
<draw_ops>
<title color="white" x="IconTitleSpacing" y="0"/>
<title color="gtk:fg[SELECTED]" x="IconTitleSpacing" y="0"/>
</draw_ops>
</piece>
@ -217,20 +217,44 @@
</button>
</frame_style>
<frame_style name="normal_maximized" parent="normal">
<button function="maximize" state="normal">
<draw_ops>
<include name="inactive_button"/>
<image filename="inactive-restore-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-restore-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-restore-button.png" x="2" y="2" width="width-4" height="height-4"/>
</draw_ops>
</button>
</frame_style>
<!-- Active (focused) shaded style -->
<frame_style name="normal_shaded" geometry="normal" parent="normal">
<piece position="left_titlebar_edge">
<draw_ops>
<image filename="inactive-left-top-border-shaded.png" x="0" y="3" width="object_width" height="object_height"/>
</draw_ops>
</piece>
<piece position="right_titlebar_edge">
<draw_ops>
<image filename="inactive-right-top-border-shaded.png" x="width - object_width" y="3" width="object_width" height="object_height"/>
</draw_ops>
</piece>
</frame_style>
<frame_style name="normal_shaded" geometry="normal" parent="normal">
<piece position="left_titlebar_edge">
<draw_ops>
<image filename="inactive-left-top-border-shaded.png" x="0" y="3" width="object_width" height="object_height"/>
</draw_ops>
</piece>
<piece position="right_titlebar_edge">
<draw_ops>
<image filename="inactive-right-top-border-shaded.png" x="width - object_width" y="3" width="object_width" height="object_height"/>
</draw_ops>
</piece>
</frame_style>
<!-- Active (focused) style -->
<frame_style name="focused" geometry="normal">
@ -248,7 +272,7 @@
<piece position="title">
<draw_ops>
<title color="white" x="IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/>
<title color="gtk:fg[SELECTED]" x="IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/>
</draw_ops>
</piece>
@ -399,6 +423,30 @@
</button>
</frame_style>
<frame_style name="focused_maximized" geometry="normal" parent="focused">
<button function="maximize" state="normal">
<draw_ops>
<include name="active_button"/>
<image filename="active-restore-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-restore-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-restore-button.png" x="2" y="2" width="width-4" height="height-4"/>
</draw_ops>
</button>
</frame_style>
<!-- Active (focused) shaded style -->
<frame_style name="focused_shaded" geometry="normal" parent="focused">
<piece position="left_titlebar_edge">
@ -469,12 +517,12 @@
<frame_style_set name="normal">
<frame focus="yes" state="shaded" style="focused_shaded"/>
<frame focus="yes" state="normal" resize="both" style="focused"/>
<frame focus="yes" state="maximized" style="focused"/>
<frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/>
<frame focus="yes" state="maximized" style="focused_maximized"/>
<frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/>
<frame focus="no" state="normal" resize="both" style="normal"/>
<frame focus="no" state="shaded" style="normal_shaded"/>
<frame focus="no" state="maximized" style="normal"/>
<frame focus="no" state="maximized_and_shaded" style="normal_shaded"/>
<frame focus="no" state="maximized" style="normal_maximized"/>
<frame focus="no" state="maximized_and_shaded" style="normal_maximized"/>
</frame_style_set>
<frame_style_set name="border">