csd decorations: simplify gtk4 stylesheet

hardpixel · Mar 26, 2021 · b535340 · b535340
1 parent bd52ebd
commit b535340
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 66 deletions.
diff --git a/[email protected]/styles/gtk4/buttons-left/always.css b/[email protected]/styles/gtk4/buttons-left/always.css
@@ -1,17 +1,8 @@
-window headerbar:not(.selection-mode),
-window .titlebar:not(.selection-mode) {
-  padding-left: 0;
+window headerbar windowhandle {
+  margin-left: -6px;
 }
 
-window headerbar ~ headerbar:not(.selection-mode),
-window headerbar ~ .titlebar:not(.selection-mode),
-window .titlebar ~ .titlebar:not(.selection-mode),
-window .titlebar ~ headerbar:not(.selection-mode) {
-  padding-left: 6px;
-}
-
-window headerbar windowcontrols.start,
-window .titlebar windowcontrols.start {
+window headerbar windowcontrols.start {
   margin: 0 0 0 -200px;
   opacity: 0;
 }

diff --git a/[email protected]/styles/gtk4/buttons-left/maximized.css b/[email protected]/styles/gtk4/buttons-left/maximized.css
@@ -1,17 +1,8 @@
-.maximized headerbar:not(.selection-mode),
-.maximized .titlebar:not(.selection-mode) {
-  padding-left: 0;
+.maximized headerbar windowhandle {
+  margin-left: -6px;
 }
 
-.maximized headerbar ~ headerbar:not(.selection-mode),
-.maximized headerbar ~ .titlebar:not(.selection-mode),
-.maximized .titlebar ~ .titlebar:not(.selection-mode),
-.maximized .titlebar ~ headerbar:not(.selection-mode) {
-  padding-left: 6px;
-}
-
-.maximized headerbar windowcontrols.start,
-.maximized .titlebar windowcontrols.start {
+.maximized headerbar windowcontrols.start {
   margin: 0 0 0 -200px;
   opacity: 0;
 }

diff --git a/[email protected]/styles/gtk4/buttons-left/tiled.css b/[email protected]/styles/gtk4/buttons-left/tiled.css
@@ -1,17 +1,8 @@
-.tiled headerbar:not(.selection-mode),
-.tiled .titlebar:not(.selection-mode) {
-  padding-left: 0;
+.tiled headerbar windowhandle {
+  margin-left: -6px;
 }
 
-.tiled headerbar ~ headerbar:not(.selection-mode),
-.tiled headerbar ~ .titlebar:not(.selection-mode),
-.tiled .titlebar ~ .titlebar:not(.selection-mode),
-.tiled .titlebar ~ headerbar:not(.selection-mode) {
-  padding-left: 6px;
-}
-
-.tiled headerbar windowcontrols.start,
-.tiled .titlebar windowcontrols.start {
+.tiled headerbar windowcontrols.start {
   margin: 0 0 0 -200px;
   opacity: 0;
 }

diff --git a/[email protected]/styles/gtk4/buttons-right/always.css b/[email protected]/styles/gtk4/buttons-right/always.css
@@ -1,15 +1,8 @@
-window > headerbar:not(.selection-mode),
-window > .titlebar:not(.selection-mode),
-window > headerbar > headerbar:not(.selection-mode),
-window > .titlebar > .titlebar:not(.selection-mode),
-window > .titlebar > stack > headerbar:not(.selection-mode),
-window headerbar:last-child:not(.selection-mode),
-window .titlebar:last-child:not(.selection-mode) {
-  padding-right: 0;
+window headerbar windowhandle {
+  margin-right: -6px;
 }
 
-window headerbar windowcontrols.end,
-window .titlebar windowcontrols.end {
+window headerbar windowcontrols.end {
   margin: 0 -200px 0 0;
   opacity: 0;
 }

diff --git a/[email protected]/styles/gtk4/buttons-right/maximized.css b/[email protected]/styles/gtk4/buttons-right/maximized.css
@@ -1,15 +1,8 @@
-.maximized > headerbar:not(.selection-mode),
-.maximized > .titlebar:not(.selection-mode),
-.maximized > headerbar > headerbar:not(.selection-mode),
-.maximized > .titlebar > .titlebar:not(.selection-mode),
-.maximized > .titlebar > stack > headerbar:not(.selection-mode),
-.maximized headerbar:last-child:not(.selection-mode),
-.maximized .titlebar:last-child:not(.selection-mode) {
-  padding-right: 0;
+.maximized headerbar windowhandle {
+  margin-right: -6px;
 }
 
-.maximized headerbar windowcontrols.end,
-.maximized .titlebar windowcontrols.end {
+.maximized headerbar windowcontrols.end {
   margin: 0 -200px 0 0;
   opacity: 0;
 }

diff --git a/[email protected]/styles/gtk4/buttons-right/tiled.css b/[email protected]/styles/gtk4/buttons-right/tiled.css
@@ -1,15 +1,8 @@
-.tiled > headerbar:not(.selection-mode),
-.tiled > .titlebar:not(.selection-mode),
-.tiled > headerbar > headerbar:not(.selection-mode),
-.tiled > .titlebar > .titlebar:not(.selection-mode),
-.tiled > .titlebar > stack > headerbar:not(.selection-mode),
-.tiled headerbar:last-child:not(.selection-mode),
-.tiled .titlebar:last-child:not(.selection-mode) {
-  padding-right: 0;
+.tiled headerbar windowhandle {
+  margin-right: -6px;
 }
 
-.tiled headerbar windowcontrols.end,
-.tiled .titlebar windowcontrols.end {
+.tiled headerbar windowcontrols.end {
   margin: 0 -200px 0 0;
   opacity: 0;
 }