[libhandy] window: Use window radius instead of decoration for masking



commit 0952057eb4752366f674b0af092ce91c0978e0ab
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed Jul 15 01:27:55 2020 +0500

    window: Use window radius instead of decoration for masking
    
    elementary wants to have decoration with black background and 0 border
    radius, and their usual border-radius on the window for maximized
    windows.

 src/hdy-window-mixin.c             | 2 +-
 src/themes/Adwaita-dark.css        | 2 +-
 src/themes/Adwaita.css             | 2 +-
 src/themes/HighContrast.css        | 2 +-
 src/themes/HighContrastInverse.css | 2 +-
 src/themes/_Adwaita-base.scss      | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/hdy-window-mixin.c b/src/hdy-window-mixin.c
index a765d267..d55536cb 100644
--- a/src/hdy-window-mixin.c
+++ b/src/hdy-window-mixin.c
@@ -370,7 +370,7 @@ hdy_window_mixin_draw (HdyWindowMixin *self,
     w = width - shadow.left - shadow.right;
     h = height - shadow.top - shadow.bottom;
 
-    gtk_style_context_get (self->decoration_context,
+    gtk_style_context_get (context,
                            gtk_style_context_get_state (self->decoration_context),
                            GTK_STYLE_PROPERTY_BORDER_RADIUS, &r,
                            NULL);
diff --git a/src/themes/Adwaita-dark.css b/src/themes/Adwaita-dark.css
index d1e57e0b..7fed6d0d 100644
--- a/src/themes/Adwaita-dark.css
+++ b/src/themes/Adwaita-dark.css
@@ -178,4 +178,4 @@ window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: none
 
 window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.065); }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
+window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized),
 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
diff --git a/src/themes/Adwaita.css b/src/themes/Adwaita.css
index 0a7e11a2..866817c6 100644
--- a/src/themes/Adwaita.css
+++ b/src/themes/Adwaita.css
@@ -178,4 +178,4 @@ window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: none
 
 window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.8); }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
+window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized),
 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
diff --git a/src/themes/HighContrast.css b/src/themes/HighContrast.css
index a8eb25ac..32f4a63b 100644
--- a/src/themes/HighContrast.css
+++ b/src/themes/HighContrast.css
@@ -178,4 +178,4 @@ window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: none
 
 window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.8); }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
+window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized),
 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
diff --git a/src/themes/HighContrastInverse.css b/src/themes/HighContrastInverse.css
index 48464e58..d7e0ecb7 100644
--- a/src/themes/HighContrastInverse.css
+++ b/src/themes/HighContrastInverse.css
@@ -178,4 +178,4 @@ window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: none
 
 window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.065); }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
+window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized),
 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
diff --git a/src/themes/_Adwaita-base.scss b/src/themes/_Adwaita-base.scss
index df287ed3..1b877171 100644
--- a/src/themes/_Adwaita-base.scss
+++ b/src/themes/_Adwaita-base.scss
@@ -323,6 +323,7 @@ window.csd.unified:not(.solid-csd):not(.fullscreen) {
   }
 
   &:not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized) {
+    &,
     > decoration,
     > decoration-overlay {
       border-radius: 8px;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]