really fix maximized backdrop titlebars

7 files changed, 58 insertions, 88 deletions

diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index e7dd042..63affcc 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -924,8 +924,6 @@ GtkComboBox {
     border-color: rgba(38, 42, 51, 0.97); }
   .header-bar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
-    .csd .header-bar:backdrop {
-      background-color: rgba(50, 56, 67, 0.97); }
   .header-bar .title {
     padding: 0px 12px; }
   .header-bar .subtitle {
@@ -998,16 +996,16 @@ GtkComboBox {
   .maximized .header-bar {
     background-color: #2f343f;
     border-color: #262a33; }
-    .maximized .header-bar:backdrop {
-      border-color: #262a33; }
   .header-bar.default-decoration,
-  .csd .header-bar.default-decoration {
+  .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop,
+  .csd .header-bar.default-decoration:backdrop {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
+    .maximized .header-bar.default-decoration,
+    .maximized .csd .header-bar.default-decoration, .maximized .header-bar.default-decoration:backdrop,
+    .maximized .csd .header-bar.default-decoration:backdrop {
       background-color: #2f343f; }
 
 .titlebar {
@@ -1020,15 +1018,14 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(47, 52, 63, 0.97); }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5); }
+    color: rgba(207, 218, 231, 0.5);
+    background-color: #323843; }
     .csd .titlebar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
-      .csd .maximized .titlebar:backdrop {
-        background-color: #323843; }
 
 .titlebar .titlebar,
 .titlebar .titlebar:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index b6bd3e5..2e01edf 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -927,8 +927,6 @@ GtkComboBox {
     border-color: rgba(38, 42, 51, 0.97); }
   .header-bar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
-    .csd .header-bar:backdrop {
-      background-color: rgba(50, 56, 67, 0.97); }
   .header-bar .title {
     padding: 0px 12px; }
   .header-bar .subtitle {
@@ -1001,16 +999,16 @@ GtkComboBox {
   .maximized .header-bar {
     background-color: #2f343f;
     border-color: #262a33; }
-    .maximized .header-bar:backdrop {
-      border-color: #262a33; }
   .header-bar.default-decoration,
-  .csd .header-bar.default-decoration {
+  .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop,
+  .csd .header-bar.default-decoration:backdrop {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
+    .maximized .header-bar.default-decoration,
+    .maximized .csd .header-bar.default-decoration, .maximized .header-bar.default-decoration:backdrop,
+    .maximized .csd .header-bar.default-decoration:backdrop {
       background-color: #2f343f; }
 
 .titlebar {
@@ -1023,15 +1021,14 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(47, 52, 63, 0.97); }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5); }
+    color: rgba(207, 218, 231, 0.5);
+    background-color: #323843; }
     .csd .titlebar:backdrop {
       background-color: rgba(50, 56, 67, 0.97); }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
-      .csd .maximized .titlebar:backdrop {
-        background-color: #323843; }
 
 .titlebar .titlebar,
 .titlebar .titlebar:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index 26424ec..29ab41f 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -924,8 +924,6 @@ GtkComboBox {
     border-color: #262a33; }
   .header-bar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
-    .csd .header-bar:backdrop {
-      background-color: #323843; }
   .header-bar .title {
     padding: 0px 12px; }
   .header-bar .subtitle {
@@ -998,16 +996,16 @@ GtkComboBox {
   .maximized .header-bar {
     background-color: #2f343f;
     border-color: #262a33; }
-    .maximized .header-bar:backdrop {
-      border-color: #262a33; }
   .header-bar.default-decoration,
-  .csd .header-bar.default-decoration {
+  .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop,
+  .csd .header-bar.default-decoration:backdrop {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
+    .maximized .header-bar.default-decoration,
+    .maximized .csd .header-bar.default-decoration, .maximized .header-bar.default-decoration:backdrop,
+    .maximized .csd .header-bar.default-decoration:backdrop {
       background-color: #2f343f; }
 
 .titlebar {
@@ -1020,15 +1018,14 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #2f343f; }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5); }
+    color: rgba(207, 218, 231, 0.5);
+    background-color: #323843; }
     .csd .titlebar:backdrop {
       background-color: #323843; }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
-      .csd .maximized .titlebar:backdrop {
-        background-color: #323843; }
 
 .titlebar .titlebar,
 .titlebar .titlebar:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index 5437fa3..229df55 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -927,8 +927,6 @@ GtkComboBox {
     border-color: #262a33; }
   .header-bar:backdrop {
     color: rgba(207, 218, 231, 0.5); }
-    .csd .header-bar:backdrop {
-      background-color: #323843; }
   .header-bar .title {
     padding: 0px 12px; }
   .header-bar .subtitle {
@@ -1001,16 +999,16 @@ GtkComboBox {
   .maximized .header-bar {
     background-color: #2f343f;
     border-color: #262a33; }
-    .maximized .header-bar:backdrop {
-      border-color: #262a33; }
   .header-bar.default-decoration,
-  .csd .header-bar.default-decoration {
+  .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop,
+  .csd .header-bar.default-decoration:backdrop {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #2f343f;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
+    .maximized .header-bar.default-decoration,
+    .maximized .csd .header-bar.default-decoration, .maximized .header-bar.default-decoration:backdrop,
+    .maximized .csd .header-bar.default-decoration:backdrop {
       background-color: #2f343f; }
 
 .titlebar {
@@ -1023,15 +1021,14 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #2f343f; }
   .titlebar:backdrop {
-    color: rgba(207, 218, 231, 0.5); }
+    color: rgba(207, 218, 231, 0.5);
+    background-color: #323843; }
     .csd .titlebar:backdrop {
       background-color: #323843; }
   .maximized .titlebar {
     background-color: #2f343f; }
-    .maximized .titlebar:backdrop {
+    .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #323843; }
-      .csd .maximized .titlebar:backdrop {
-        background-color: #323843; }
 
 .titlebar .titlebar,
 .titlebar .titlebar:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index d0dd437..e1e3896 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -927,8 +927,6 @@ GtkComboBox {
     border-color: #d4d5db; }
   .header-bar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
-    .csd .header-bar:backdrop {
-      background-color: #eff0f2; }
   .header-bar .title {
     padding: 0px 12px; }
   .header-bar .subtitle {
@@ -1001,16 +999,16 @@ GtkComboBox {
   .maximized .header-bar {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
-    .maximized .header-bar:backdrop {
-      border-color: #d4d5db; }
   .header-bar.default-decoration,
-  .csd .header-bar.default-decoration {
+  .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop,
+  .csd .header-bar.default-decoration:backdrop {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
+    .maximized .header-bar.default-decoration,
+    .maximized .csd .header-bar.default-decoration, .maximized .header-bar.default-decoration:backdrop,
+    .maximized .csd .header-bar.default-decoration:backdrop {
       background-color: #e7e8eb; }
 
 .titlebar {
@@ -1023,15 +1021,14 @@ GtkComboBox {
   .csd .titlebar {
     background-color: #e7e8eb; }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5); }
+    color: rgba(82, 93, 118, 0.5);
+    background-color: #eff0f2; }
     .csd .titlebar:backdrop {
       background-color: #eff0f2; }
   .maximized .titlebar {
     background-color: #e7e8eb; }
-    .maximized .titlebar:backdrop {
+    .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
-      .csd .maximized .titlebar:backdrop {
-        background-color: #eff0f2; }
 
 .titlebar .titlebar,
 .titlebar .titlebar:backdrop {
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index e07aba1..1d89105 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -927,8 +927,6 @@ GtkComboBox {
     border-color: rgba(212, 213, 219, 0.95); }
   .header-bar:backdrop {
     color: rgba(82, 93, 118, 0.5); }
-    .csd .header-bar:backdrop {
-      background-color: rgba(239, 240, 242, 0.95); }
   .header-bar .title {
     padding: 0px 12px; }
   .header-bar .subtitle {
@@ -1001,16 +999,16 @@ GtkComboBox {
   .maximized .header-bar {
     background-color: #e7e8eb;
     border-color: #d4d5db; }
-    .maximized .header-bar:backdrop {
-      border-color: #d4d5db; }
   .header-bar.default-decoration,
-  .csd .header-bar.default-decoration {
+  .csd .header-bar.default-decoration, .header-bar.default-decoration:backdrop,
+  .csd .header-bar.default-decoration:backdrop {
     padding-top: 5px;
     padding-bottom: 5px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
-    .header-bar.default-decoration:backdrop,
-    .csd .header-bar.default-decoration:backdrop {
+    .maximized .header-bar.default-decoration,
+    .maximized .csd .header-bar.default-decoration, .maximized .header-bar.default-decoration:backdrop,
+    .maximized .csd .header-bar.default-decoration:backdrop {
       background-color: #e7e8eb; }
 
 .titlebar {
@@ -1023,15 +1021,14 @@ GtkComboBox {
   .csd .titlebar {
     background-color: rgba(231, 232, 235, 0.95); }
   .titlebar:backdrop {
-    color: rgba(82, 93, 118, 0.5); }
+    color: rgba(82, 93, 118, 0.5);
+    background-color: #eff0f2; }
     .csd .titlebar:backdrop {
       background-color: rgba(239, 240, 242, 0.95); }
   .maximized .titlebar {
     background-color: #e7e8eb; }
-    .maximized .titlebar:backdrop {
+    .maximized .titlebar:backdrop, .csd .maximized .titlebar:backdrop {
       background-color: #eff0f2; }
-      .csd .maximized .titlebar:backdrop {
-        background-color: #eff0f2; }
 
 .titlebar .titlebar,
 .titlebar .titlebar:backdrop {
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index 0700d58..3a823f7 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -1046,12 +1046,7 @@ GtkComboBox {
     border-color: $header_border;
   }
 
-  &:backdrop {
-    color: transparentize($header_fg, 0.3);
-    //background-color: opacify($header_bg_backdrop, 1);
-
-    .csd & { background-color: $header_bg_backdrop; }  // Transparent header-bars only in csd windows
-  }
+  &:backdrop { color: transparentize($header_fg, 0.3); }
 
   .title {
     padding: 0px 12px;
@@ -1134,21 +1129,18 @@ GtkComboBox {
   .maximized & {
     background-color: opacify($header_bg, 1);
     border-color: opacify($header_border, 1);
-
-    &:backdrop {
-      //background-color: opacify($header_bg_backdrop, 1);
-      border-color: opacify($header_border, 1);
-    }
   }
+
   &.default-decoration,
-  .csd &.default-decoration {
-    padding-top: 5px;	    // less padding for ssd
-    padding-bottom: 5px;    //
+  .csd &.default-decoration,             // needed under wayland, since all gtk3 windows are csd windows
+  &.default-decoration:backdrop,
+  .csd &.default-decoration:backdrop {
+    padding-top: 5px;	                   // less padding for ssd
+    padding-bottom: 5px;                 //
     background-color: opacify($header_bg, 1);
     border-bottom-width: 0;
 
-    //&:backdrop { background-color: opacify($header_bg_backdrop, 1); }
-    &:backdrop { background-color: opacify($header_bg, 1); }
+    .maximized & { background-color: opacify($header_bg, 1); }
   }
 }
 
@@ -1164,7 +1156,7 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    //background-color: opacify($header_bg_backdrop, 1);
+    background-color: opacify($header_bg_backdrop, 1);
 
     .csd & { background-color: $header_bg_backdrop; }
   }
@@ -1172,11 +1164,7 @@ GtkComboBox {
   .maximized & {
     background-color: opacify($header_bg, 1);
 
-    &:backdrop {
-    background-color: opacify($header_bg_backdrop, 1);
-
-    .csd & { background-color: opacify($header_bg_backdrop, 1); }
-    }
+    &:backdrop, .csd &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 }