adwaita gtk3: reworked column headers selectors to separate the visual part

              from the sizing one, while fixing Files "jumpy listview" in
              backdrop. Thanks to Sebastian Keller for spotting.

2 files changed, 79 insertions, 41 deletions

diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
index 6f25a223..08f8ef9a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -142,7 +142,6 @@ GtkSwitch.trough:active {
     border-style: solid;
     border-color: transparent;
 }
-
 /* column-headers borders */
 column-header.button,
 column-header .button,
@@ -150,24 +149,29 @@ column-header.button:active,
 column-header .button:active,
 column-header.button:active:hover,
 column-header .button:active:hover,
-column-header .button.dnd {
-    border-image: linear-gradient(to top,
-                                  @borders,
-                                  @theme_base_color
-                                  ) 0 1 1 0;
+column-header.button:backdrop,
+column-header .button:backdrop,
+column-header.button:insensitive,
+column-header .button:insensitive,
+column-header.button:last-child:backdrop,
+column-header:last-child .button:backdrop {
     border-width: 0 1px 1px 0;
     border-radius: 0;
     border-style: solid;
     border-color: transparent;
 }
 
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover {
-    border-width: 0 0 1px 0;
+column-header.button,
+column-header .button,
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover,
+column-header .button.dnd {
+    border-image: linear-gradient(to top,
+                                  @borders,
+                                  @theme_base_color
+                                  ) 0 1 1 0;
 }
 
 column-header.button:backdrop,
@@ -175,10 +179,6 @@ column-header .button:backdrop,
 column-header.button:last-child:backdrop,
 column-header:last-child .button:backdrop {
     border-image: none;
-    border-width: 0 1px 1px 0;
-    border-radius: 0;
-    border-style: solid;
-    border-color: transparent;
 }
 
 column-header.button:insensitive,
@@ -187,12 +187,30 @@ column-header .button:insensitive {
                                   @borders,
                                   @insensitive_bg_color
                                   ) 0 1 1 0;
-    border-width: 0 1px 1px 0;
-    border-radius: 0;
-    border-style: solid;
-    border-color: transparent;
 }
 
+column-header.button:last-child,
+column-header:last-child .button,
+column-header.button:last-child:active,
+column-header:last-child .button:active,
+column-header.button:last-child:active:hover,
+column-header:last-child .button:active:hover,
+column-header.button:last-child:backdrop,
+column-header:last-child .button:backdrop {
+    border-right-width: 0;
+}
+
+column-header.button:last-child,
+column-header:last-child .button,
+column-header.button:last-child:active,
+column-header:last-child .button:active,
+column-header.button:last-child:active:hover,
+column-header:last-child .button:active:hover {
+    border-image: none;
+    border-color: mix(@borders, @theme_base_color, 0.5);
+}
+
+
 /* unfocused window: generic element borders */
 .selection-mode.toolbar .suggested-action.button:backdrop, 
 .selection-mode.toolbar GtkToolButton.suggested-action .button:backdrop,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index e1af847d..b2f489d8 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -150,24 +150,29 @@ column-header.button:active,
 column-header .button:active,
 column-header.button:active:hover,
 column-header .button:active:hover,
-column-header .button.dnd {
-    border-image: linear-gradient(to top,
-                                  mix(@borders, @theme_base_color, 0.5),
-                                  @theme_base_color
-                                  ) 0 1 1 0;
+column-header.button:backdrop,
+column-header .button:backdrop,
+column-header.button:insensitive,
+column-header .button:insensitive,
+column-header.button:last-child:backdrop,
+column-header:last-child .button:backdrop {
     border-width: 0 1px 1px 0;
     border-radius: 0;
     border-style: solid;
     border-color: transparent;
 }
 
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover {
-    border-width: 0 0 1px 0;
+column-header.button,
+column-header .button,
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover,
+column-header .button.dnd {
+    border-image: linear-gradient(to top,
+                                  mix(@borders, @theme_base_color, 0.5),
+                                  @theme_base_color
+                                  ) 0 1 1 0;
 }
 
 column-header.button:backdrop,
@@ -175,10 +180,6 @@ column-header .button:backdrop,
 column-header.button:last-child:backdrop,
 column-header:last-child .button:backdrop {
     border-image: none;
-    border-width: 0 1px 1px 0;
-    border-radius: 0;
-    border-style: solid;
-    border-color: transparent;
 }
 
 column-header.button:insensitive,
@@ -187,12 +188,31 @@ column-header .button:insensitive {
                                   mix(@insensitive_borders, @insensitive_bg_color, 0.5),
                                   @insensitive_bg_color
                                   ) 0 1 1 0;
-    border-width: 0 1px 1px 0;
-    border-radius: 0;
-    border-style: solid;
-    border-color: transparent;
 }
 
+column-header.button:last-child,
+column-header:last-child .button,
+column-header.button:last-child:active,
+column-header:last-child .button:active,
+column-header.button:last-child:active:hover,
+column-header:last-child .button:active:hover,
+column-header.button:last-child:backdrop,
+column-header:last-child .button:backdrop {
+    border-right-width: 0;
+}
+
+column-header.button:last-child,
+column-header:last-child .button,
+column-header.button:last-child:active,
+column-header:last-child .button:active,
+column-header.button:last-child:active:hover,
+column-header:last-child .button:active:hover {
+    border-image: none;
+    border-color: mix(@borders, @theme_base_color, 0.5);
+}
+
+
+
 /* unfocused window: generic element borders */
 .selection-mode.toolbar .suggested-action.button:backdrop, 
 .selection-mode.toolbar GtkToolButton.suggested-action .button:backdrop,