From 6c18374142f9b45ede0fdecef660f503e854ccb0 Mon Sep 17 00:00:00 2001 From: Calum Benson Date: Tue, 5 Nov 2002 19:38:12 +0000 Subject: [PATCH] Crux tweaks: adds a Restore button for maximized windows, and un-hard-codes titlebar text colors. Fixes #97759. --- ChangeLog | 8 ++ src/themes/Crux/active-restore-button.png | Bin 0 -> 171 bytes src/themes/Crux/inactive-restore-button.png | Bin 0 -> 249 bytes src/themes/Crux/metacity-theme-1.xml | 84 +++++++++++++++----- 4 files changed, 74 insertions(+), 18 deletions(-) create mode 100644 src/themes/Crux/active-restore-button.png create mode 100644 src/themes/Crux/inactive-restore-button.png diff --git a/ChangeLog b/ChangeLog index 2aea9b67b..32b39cf7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-11-05 Calum Benson + + * 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 * src/workspace.c (meta_workspace_get_neighbor): apply patch from diff --git a/src/themes/Crux/active-restore-button.png b/src/themes/Crux/active-restore-button.png new file mode 100644 index 0000000000000000000000000000000000000000..ec7259e3f0ea1aa4936626c1c9e41a4e00be4495 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k&H|6fVg?3oJ`iSf*!R#8D9B#o z>FdgViJMhWm3>Ei)DobOm#2$kNX4A96CJq@7;vzZd;R@;=& literal 0 HcmV?d00001 diff --git a/src/themes/Crux/inactive-restore-button.png b/src/themes/Crux/inactive-restore-button.png new file mode 100644 index 0000000000000000000000000000000000000000..bafa29675463540e75864a4fdab045f72f0ad0c3 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k&H|6fVg?3oUJzz{%YHxyD9B#o z>FdgViJMhWRlBR*%pE8+!_&nvq+(9*#Djb-3IfjebN-~BQ;Yd&%`ewm(@@V)!mri6 zYj>j1p(Vb{Weq&Pg!N2hOt`&G@1TkA?gdjWy$xcWBys%Xyz>luzK1)W`}zLLGDd^_pfMeta|PUnvuN#yLyof^%2*J)F;{*z$RupKku78P6p>XIx!Ty^U@1 tkxe@C?ca{?=X`z1(Cu33-uFK@-+SAbW>(ZL{RHSn22WQ%mvv4FO#p@rV9fvk literal 0 HcmV?d00001 diff --git a/src/themes/Crux/metacity-theme-1.xml b/src/themes/Crux/metacity-theme-1.xml index 989e99444..a69945618 100644 --- a/src/themes/Crux/metacity-theme-1.xml +++ b/src/themes/Crux/metacity-theme-1.xml @@ -80,7 +80,7 @@ - + <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">