From cf0a970f26d30c5db7c0af25396eb6e2dc1924a0 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 18 Apr 2018 13:54:11 +0200
Subject: Fix HighContrast themes visibility with metacity

When rendered with metacity (e.g. with metacity-theme-viewer), the
back background parts of HighContrast and HighContrastInverse actually
show up transparent. This is because the corresponding rectangles were
missing the filled attribute.

In the HighContrast case, the gtk_arrow is getting drawn black on black (and
there is currently no way to change the color), so we can as well draw
it by hand to be able to change the color.

The close button also deserves bigger width to be more visible.

Fixes #211
---
 marco-themes/HighContrast/metacity-theme-1.xml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'marco-themes')

diff --git a/marco-themes/HighContrast/metacity-theme-1.xml b/marco-themes/HighContrast/metacity-theme-1.xml
index 06c7e3cd..d6135f47 100644
--- a/marco-themes/HighContrast/metacity-theme-1.xml
+++ b/marco-themes/HighContrast/metacity-theme-1.xml
@@ -72,11 +72,18 @@
 </draw_ops>
 
 <draw_ops name="menu_button">
-  <gtk_arrow state="normal" shadow="out" arrow="down"
-             x="ArrowSpacer `min` (width-MinArrowSize)/2"
-             y="ArrowSpacer `min` (height-MinArrowSize)/2"
-             width="(width-(ArrowSpacer*2)) `max` MinArrowSize"
-             height="(height-(ArrowSpacer*2)) `max` MinArrowSize"/>
+  <line color="gtk:bg[NORMAL]"
+             x1="ArrowSpacer `min` (width-MinArrowSize)/2"
+	     y1="ArrowSpacer `min` (height-MinArrowSize)/2"
+	     x2="width/2"
+	     y2="(height - ArrowSpacer) `max` (height - (height-MinArrowSize)/2)"
+	     width="3"/>
+  <line color="gtk:bg[NORMAL]"
+             x1="(width - ArrowSpacer) `max` (width - (width-MinArrowSize)/2)"
+	     y1="ArrowSpacer `min` (height-MinArrowSize)/2"
+	     x2="width/2"
+	     y2="(height - ArrowSpacer) `max` (height - (height-MinArrowSize)/2)"
+	     width="3"/>
 </draw_ops>
 
 <draw_ops name="menu_button_pressed">
@@ -135,11 +142,11 @@
   <line color="gtk:bg[NORMAL]"
         x1="ButtonIPad" y1="ButtonIPad"
         x2="width - ButtonIPad - 1" y2="height - ButtonIPad - 1"
-        width="1"/>
+        width="3"/>
   <line color="gtk:bg[NORMAL]"
         x1="ButtonIPad" y1="height - ButtonIPad - 1"
         x2="width - ButtonIPad - 1" y2="ButtonIPad"
-	width="1"/>
+	width="3"/>
 </draw_ops>
 
 <draw_ops name="close_button_pressed">
@@ -147,7 +154,7 @@
 </draw_ops>
 
 <draw_ops name="outer_bevel">
-  <rectangle color="gtk:fg[NORMAL]"
+  <rectangle color="gtk:fg[NORMAL]" filled="true"
              x="0" y="0" width="width-1" height="height-1"/>
   <line color="gtk:light[NORMAL]"
         x1="1" y1="1" x2="1" y2="height-2"/>
-- 
cgit v1.2.1