summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCalum Benson <calum@src.gnome.org>2002-11-05 19:38:12 +0000
committerCalum Benson <calum@src.gnome.org>2002-11-05 19:38:12 +0000
commit6c18374142f9b45ede0fdecef660f503e854ccb0 (patch)
tree68776d77a4ef4eff28a22e7e8854baf831c93327
parenta64b868dbd93ec1029bea5e3f8d77472272f6b0c (diff)
downloadmetacity-6c18374142f9b45ede0fdecef660f503e854ccb0.tar.gz
metacity-6c18374142f9b45ede0fdecef660f503e854ccb0.tar.bz2
Crux tweaks: adds a Restore button for maximized windows, and un-hard-codes
titlebar text colors. Fixes #97759.
-rw-r--r--ChangeLog8
-rw-r--r--src/themes/Crux/active-restore-button.pngbin0 -> 171 bytes
-rw-r--r--src/themes/Crux/inactive-restore-button.pngbin0 -> 249 bytes
-rw-r--r--src/themes/Crux/metacity-theme-1.xml76
4 files changed, 70 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 2aea9b6..32b39cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/src/themes/Crux/active-restore-button.png b/src/themes/Crux/active-restore-button.png
new file mode 100644
index 0000000..ec7259e
--- /dev/null
+++ b/src/themes/Crux/active-restore-button.png
Binary files differ
diff --git a/src/themes/Crux/inactive-restore-button.png b/src/themes/Crux/inactive-restore-button.png
new file mode 100644
index 0000000..bafa296
--- /dev/null
+++ b/src/themes/Crux/inactive-restore-button.png
Binary files differ
diff --git a/src/themes/Crux/metacity-theme-1.xml b/src/themes/Crux/metacity-theme-1.xml
index 989e994..a699456 100644
--- a/src/themes/Crux/metacity-theme-1.xml
+++ b/src/themes/Crux/metacity-theme-1.xml
@@ -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,21 +217,45 @@
</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>
-<!-- Active (focused) shaded style -->
-<frame_style name="normal_shaded" geometry="normal" parent="normal">
- <piece position="left_titlebar_edge">
+ <button function="maximize" state="pressed">
<draw_ops>
- <image filename="inactive-left-top-border-shaded.png" x="0" y="3" width="object_width" height="object_height"/>
+ <include name="inactive_button_pressed"/>
+ <image filename="inactive-restore-button.png" x="2" y="2" width="width - 4" height="height - 4"/>
</draw_ops>
- </piece>
- <piece position="right_titlebar_edge">
+ </button>
+
+ <button function="maximize" state="prelight">
<draw_ops>
- <image filename="inactive-right-top-border-shaded.png" x="width - object_width" y="3" width="object_width" height="object_height"/>
+ <include name="inactive_button_prelight"/>
+ <image filename="inactive-restore-button.png" x="2" y="2" width="width-4" height="height-4"/>
</draw_ops>
- </piece>
+ </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>
+
+
<!-- Active (focused) style -->
<frame_style name="focused" geometry="normal">
<piece position="left_edge">
@@ -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">