[gtk+/gtk-3-22] Adwaita: Add missing rule for fullscreen headerbar



commit 385057414669d660e0fa92eb8a809f7cbcfea6d2
Author: Daniel Boles <dboles src gmail com>
Date:   Wed May 31 19:08:28 2017 +0100

    Adwaita: Add missing rule for fullscreen headerbar
    
    Another selector forces round corners for headerbars in a stack, and it
    has higher priority than the selector covering the non-stack case from
    commit 712a8adbd9a11fcebce0269562e9a028a17fa862. Totem’s MainToolbar
    happens to be in a stack, and we should maintain symmetry here anyway.
    
    So, as window classes .maximized and .tiled are excluded from this other
    selector, the newly handled .fullscreen case must be excluded here also.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=770513

 gtk/theme/Adwaita/_common.scss           |    8 ++++----
 gtk/theme/Adwaita/gtk-contained-dark.css |    6 +++---
 gtk/theme/Adwaita/gtk-contained.css      |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 9ed74dd..12e1204 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1644,10 +1644,10 @@ headerbar {
 }
 
 headerbar { // headerbar border rounding
-  window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + &, // tackles the paned 
container case
-  window:not(.tiled):not(.maximized):not(.solid-csd) &:first-child { &:backdrop, & { border-top-left-radius: 
7px; }}
-  window:not(.tiled):not(.maximized):not(.solid-csd) &:last-child { &:backdrop, & { border-top-right-radius: 
7px; }}
-  window:not(.tiled):not(.maximized):not(.solid-csd) stack & { // tackles the stacked headerbars case
+  window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) separator:first-child + &, // tackles 
the paned container case
+  window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) &:first-child { &:backdrop, & { 
border-top-left-radius: 7px; }}
+  window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) &:last-child { &:backdrop, & { 
border-top-right-radius: 7px; }}
+  window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack & { // tackles the stacked 
headerbars case
     &:first-child, &:last-child {
       &:backdrop, & {
         border-top-left-radius: 7px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index d570664..fc39f90 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -662,11 +662,11 @@ headerbar switch { margin-top: 9px; margin-bottom: 9px; }
 
 .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop, 
.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar { border-top-left-radius: 7px; 
border-top-right-radius: 7px; }
 
-window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar, 
window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child { border-top-left-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) separator:first-child + 
headerbar:backdrop, window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) separator:first-child 
+ headerbar, window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) 
headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) 
headerbar:first-child { border-top-left-radius: 7px; }
 
-window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child { border-top-right-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) headerbar:last-child:backdrop, 
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) headerbar:last-child { 
border-top-right-radius: 7px; }
 
-window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, 
window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child { border-top-left-radius: 7px; 
border-top-right-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack headerbar:first-child:backdrop, 
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack headerbar:first-child, 
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack headerbar:last-child:backdrop, 
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack headerbar:last-child { 
border-top-left-radius: 7px; border-top-right-radius: 7px; }
 
 window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparent; background-image: none; 
border-style: none; border-color: transparent; box-shadow: none; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index a70f216..c8f46a7 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -670,11 +670,11 @@ headerbar switch { margin-top: 9px; margin-bottom: 9px; }
 
 .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop, 
.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar { border-top-left-radius: 7px; 
border-top-right-radius: 7px; }
 
-window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar, 
window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child { border-top-left-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) separator:first-child + 
headerbar:backdrop, window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) separator:first-child 
+ headerbar, window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) 
headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) 
headerbar:first-child { border-top-left-radius: 7px; }
 
-window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child { border-top-right-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) headerbar:last-child:backdrop, 
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) headerbar:last-child { 
border-top-right-radius: 7px; }
 
-window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, 
window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, 
window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child { border-top-left-radius: 7px; 
border-top-right-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack headerbar:first-child:backdrop, 
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack headerbar:first-child, 
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack headerbar:last-child:backdrop, 
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack headerbar:last-child { 
border-top-left-radius: 7px; border-top-right-radius: 7px; }
 
 window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparent; background-image: none; 
border-style: none; border-color: transparent; box-shadow: none; }
 


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