Skip to content
Commits on Source (5)
mate-themes (3.22.11-1+deb9u1+hypra3) stretch; urgency=medium
[ Cyril Brulebois ]
* Add HighContrast color rework.
* Use upstream fixes for theme.
-- Alex ARNAUD <alexarnaud@hypra.fr> Wed, 19 Jun 2019 16:34:40 +0200
mate-themes (3.22.11-1+deb9u1+hypra2) stretch; urgency=medium
[ Samuel Thibault ]
......
https://gitlab.gnome.org/GNOME/gtk/merge_requests/125#note_105813
---
desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css | 1 +
1 file changed, 1 insertion(+)
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
@@ -164,7 +164,7 @@ entry {
@@ -160,6 +160,7 @@ entry {
min-height: 0;
padding: 2px;
background-image: none;
+ background-color: black;
border-color: transparent;
border-radius: 0; }
spinbutton:focus:not(.vertical),
entry:focus {
- background-color: transparent;
+ background-color: black;
border-style: solid;
background-image: linear-gradient(to bottom, #090909, #111 90%);
border-color: #aaa;
commit e71b9f720c88840461c427ff92a372eb4ad7c97e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed May 2 13:40:39 2018 +0200
HighContrast: Rework colors
We want the HightContrast theme to be as much "black-on-white" as
possible, so make buttons black on white by making the outerbevel filled
white (and only in the title area and borders, there is no need to fill
the whole window). The currently-focused window keeps a white titlebar
while the other windows get a greyed titlebar.
diff --git a/marco-themes/HighContrast/metacity-theme-1.xml b/marco-themes/HighContrast/metacity-theme-1.xml
index d6135f47..9c57a117 100644
--- a/marco-themes/HighContrast/metacity-theme-1.xml
+++ b/marco-themes/HighContrast/metacity-theme-1.xml
@@ -22,9 +22,9 @@
<!-- strip borders off the normal geometry -->
<frame_geometry name="normal_small_borders" parent="normal">
- <distance name="left_width" value="0"/>
- <distance name="right_width" value="0"/>
- <distance name="bottom_height" value="0"/>
+ <distance name="left_width" value="2"/>
+ <distance name="right_width" value="3"/>
+ <distance name="bottom_height" value="3"/>
<distance name="left_titlebar_edge" value="0"/>
<distance name="right_titlebar_edge" value="0"/>
</frame_geometry>
@@ -72,13 +72,13 @@
</draw_ops>
<draw_ops name="menu_button">
- <line color="gtk:bg[NORMAL]"
+ <line color="gtk:fg[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]"
+ <line color="gtk:fg[NORMAL]"
x1="(width - ArrowSpacer) `max` (width - (width-MinArrowSize)/2)"
y1="ArrowSpacer `min` (height-MinArrowSize)/2"
x2="width/2"
@@ -91,7 +91,7 @@
</draw_ops>
<draw_ops name="minimize_button">
- <line color="gtk:bg[NORMAL]"
+ <line color="gtk:fg[NORMAL]"
x1="ButtonIPad"
y1="height - ButtonIPad - ThickLineWidth + 1"
x2="width - ButtonIPad"
@@ -104,9 +104,9 @@
</draw_ops>
<draw_ops name="maximize_button">
- <rectangle color="gtk:bg[NORMAL]" filled="false"
+ <rectangle color="gtk:fg[NORMAL]" filled="false"
x="ButtonIPad" y="ButtonIPad" width="width-ButtonIPad*2-1" height="height-ButtonIPad*2-1"/>
- <line color="gtk:bg[NORMAL]" width="3"
+ <line color="gtk:fg[NORMAL]" width="3"
x1="ButtonIPad" y1="ButtonIPad+1" x2="width-ButtonIPad" y2="ButtonIPad+1"/>
</draw_ops>
@@ -115,11 +115,11 @@
</draw_ops>
<draw_ops name="mini_window_icon">
- <rectangle color="gtk:fg[NORMAL]" filled="true"
+ <rectangle color="gtk:bg[NORMAL]" filled="true"
x="0" y="0" width="width-1" height="height-1"/>
- <rectangle color="gtk:bg[NORMAL]" filled="false"
+ <rectangle color="gtk:fg[NORMAL]" filled="false"
x="0" y="0" width="width-1" height="height-1"/>
- <line color="gtk:bg[NORMAL]" width="2"
+ <line color="gtk:fg[NORMAL]" width="2"
x1="0" y1="1" x2="width" y2="1"/>
</draw_ops>
@@ -139,11 +139,11 @@
</draw_ops>
<draw_ops name="close_button">
- <line color="gtk:bg[NORMAL]"
+ <line color="gtk:fg[NORMAL]"
x1="ButtonIPad" y1="ButtonIPad"
x2="width - ButtonIPad - 1" y2="height - ButtonIPad - 1"
width="3"/>
- <line color="gtk:bg[NORMAL]"
+ <line color="gtk:fg[NORMAL]"
x1="ButtonIPad" y1="height - ButtonIPad - 1"
x2="width - ButtonIPad - 1" y2="ButtonIPad"
width="3"/>
@@ -154,8 +154,16 @@
</draw_ops>
<draw_ops name="outer_bevel">
- <rectangle color="gtk:fg[NORMAL]" filled="true"
+ <rectangle color="gtk:bg[NORMAL]" filled="true"
+ x="2" y="2" width="width-4" height="top_height-3"/>
+ <rectangle color="gtk:fg[NORMAL]" filled="false"
x="0" y="0" width="width-1" height="height-1"/>
+ <rectangle color="gtk:bg[NORMAL]" filled="true"
+ x="2" y="top_height-1" width="left_width-3" height="height-top_height-bottom_height+2"/>
+ <rectangle color="gtk:bg[NORMAL]" filled="true"
+ x="width-right_width+1" y="top_height-1" width="right_width-3" height="height-top_height-bottom_height+2"/>
+ <rectangle color="gtk:bg[NORMAL]" filled="true"
+ x="2" y="height-bottom_height+1" width="width-4" height="bottom_height-3"/>
<line color="gtk:light[NORMAL]"
x1="1" y1="1" x2="1" y2="height-2"/>
<line color="gtk:light[NORMAL]"
@@ -189,13 +197,15 @@
<draw_ops name="title_gradient">
<gradient type="diagonal" x="0" y="0" width="width-SpacerWidth" height="height">
- <color value="blend/gtk:bg[NORMAL]/gtk:bg[SELECTED]/0.6"/>
+ <color value="blend/gtk:bg[NORMAL]/gtk:fg[SELECTED]/0.25"/>
<color value="gtk:bg[SELECTED]"/>
</gradient>
</draw_ops>
<draw_ops name="title_spacer">
- <gtk_vline state="normal" x="width+1-SpacerWidth/2"
+ <line color="gtk:fg[NORMAL]"
+ x1="width+1-SpacerWidth/2"
+ x2="width+1-SpacerWidth/2"
y1="SpacerOffset"
y2="height - SpacerOffset"/>
</draw_ops>
@@ -219,7 +229,7 @@
<draw_ops name="title_text_with_icon">
<clip x="0" y="0" width="width-SpacerWidth" height="height"/>
- <title color="gtk:bg[NORMAL]"
+ <title color="gtk:fg[NORMAL]"
x="(0 `max` (width-title_width-mini_icon_width-IconTitleSpacing)) / 2 + mini_icon_width + IconTitleSpacing"
y="((height - title_height) / 2) `max` 0"/>
<icon x="(0 `max` (width-title_width-mini_icon_width-IconTitleSpacing)) / 2"
@@ -235,23 +245,23 @@
</draw_ops>
<draw_ops name="title_normal">
+ <include name="title_gradient"/>
<include name="title_spacer"/>
<include name="title_text_with_icon"/>
</draw_ops>
<draw_ops name="title_focused">
- <include name="title_gradient"/>
<include name="title_spacer"/>
<include name="title_text_focused_with_icon"/>
</draw_ops>
<draw_ops name="title_utility">
+ <include name="title_gradient"/>
<include name="title_spacer"/>
<include name="title_text_no_icon"/>
</draw_ops>
<draw_ops name="title_utility_focused">
- <include name="title_gradient"/>
<include name="title_spacer"/>
<include name="title_text_focused_no_icon"/>
</draw_ops>
transparent-buttons
rework-colors
transparent-title
0001_BlackMATE_change-menuitem-accelerator-font-color_b471395.patch
0002_BlackMATE_fix-font-color-in-url-bar-of-google-chrome_bb1f13b.patch
......
commit 4438dd67f526d4a9c915235d7426de985cec9da3
commit cf0a970f26d30c5db7c0af25396eb6e2dc1924a0
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 18 13:54:11 2018 +0200
......
--- a/marco-themes/HighContrast/metacity-theme-1.xml
+++ b/marco-themes/HighContrast/metacity-theme-1.xml
@@ -284,13 +284,13 @@
commit 595d9a6c8cf71f2002bb6c3ec27ad95263e6a871
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed May 2 14:52:39 2018 +0200
Fix more HighContrast themes visibility with metacity
This completes cf0a970 ("Fix HighContrast themes visibility with
metacity").
When maximized windows are 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
maximized_unfocused and maximized_focused styles do not use the proper
focus draw_ops like normal_focused and normal_unfocused.
--- a/desktop-themes/ContrastHighInverse/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/ContrastHighInverse/metacity-1/metacity-theme-1.xml
@@ -279,13 +279,13 @@
</frame_style>
<frame_style name="maximized_unfocused" geometry="normal_small_borders" parent="normal_unfocused">
......@@ -16,9 +31,9 @@
<button function="maximize" state="normal" draw_ops="restore_button"/>
<button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
</frame_style>
--- a/desktop-themes/ContrastHighInverse/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/ContrastHighInverse/metacity-1/metacity-theme-1.xml
@@ -279,13 +279,13 @@
--- a/marco-themes/HighContrast/metacity-theme-1.xml
+++ b/marco-themes/HighContrast/metacity-theme-1.xml
@@ -284,13 +284,13 @@
</frame_style>
<frame_style name="maximized_unfocused" geometry="normal_small_borders" parent="normal_unfocused">
......