[mate-themes] 01/02: debian/patches: Add 0001_Fix-HighContrast-themes-visibility-with-metacity.patch. (Closes: #895995).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository mate-themes.

commit 628303b6e8dc7f7974bd9ddf8354413c82210e2c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Apr 20 08:39:54 2018 +0200

    debian/patches: Add 0001_Fix-HighContrast-themes-visibility-with-metacity.patch. (Closes: #895995).
---
 ...hContrast-themes-visibility-with-metacity.patch | 99 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 100 insertions(+)

diff --git a/debian/patches/0001_Fix-HighContrast-themes-visibility-with-metacity.patch b/debian/patches/0001_Fix-HighContrast-themes-visibility-with-metacity.patch
new file mode 100644
index 0000000..dc39259
--- /dev/null
+++ b/debian/patches/0001_Fix-HighContrast-themes-visibility-with-metacity.patch
@@ -0,0 +1,99 @@
+commit 4438dd67f526d4a9c915235d7426de985cec9da3
+Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
+Date:   Wed Apr 18 13:54:11 2018 +0200
+
+    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
+
+diff --git a/desktop-themes/ContrastHighInverse/metacity-1/metacity-theme-1.xml b/desktop-themes/ContrastHighInverse/metacity-1/metacity-theme-1.xml
+index 9129356a..d2fd4c33 100644
+--- a/desktop-themes/ContrastHighInverse/metacity-1/metacity-theme-1.xml
++++ b/desktop-themes/ContrastHighInverse/metacity-1/metacity-theme-1.xml
+@@ -135,11 +135,11 @@
+   <line color="gtk:fg[NORMAL]"
+         x1="ButtonIPad" y1="ButtonIPad"
+         x2="width - ButtonIPad - 1" y2="height - ButtonIPad - 1"
+-        width="1"/>
++        width="3"/>
+   <line color="gtk:fg[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 +147,9 @@
+ </draw_ops>
+ 
+ <draw_ops name="outer_bevel">
+-  <rectangle color="gtk:fg[NORMAL]"
++  <rectangle color="gtk:bg[NORMAL]" filled="true"
++             x="1" y="1" width="width-3" height="height-3"/>
++  <rectangle color="gtk:fg[NORMAL]" filled="false"
+              x="0" y="0" width="width-1" height="height-1"/>
+   <line color="gtk:light[NORMAL]"
+         x1="1" y1="1" x2="1" y2="height-2"/>
+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"/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bf13471
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_Fix-HighContrast-themes-visibility-with-metacity.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-themes.git