From ee94f9ff890d784301b8ede8f11beb50ef855c5d Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Mon, 21 Mar 2016 19:42:54 +0100
Subject: [PATCH] Adwaita: simplify treeview:drop(active) code

---
 gtk/theme/Adwaita/_common.scss           | 17 +++++------------
 gtk/theme/Adwaita/gtk-contained-dark.css | 14 +++++---------
 gtk/theme/Adwaita/gtk-contained.css      | 14 +++++---------
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index dc6a3ea6dc..e03914acb0 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1605,21 +1605,14 @@ treeview.view {
     border-left-color: mix($backdrop_fg_color, $backdrop_bg_color, 50%);
     border-top: $backdrop_bg_color;
   }
-
-  &.before:drop(active) {
-    border-style: solid none none none;
-    border-width: 1px;
-    border-color: mix($fg_color, $selected_bg_color, 50%);
-  }
-  &.after:drop(active) {
-    border-style: none none solid none;
-    border-width: 1px;
-    border-color: mix($fg_color, $selected_bg_color, 50%);
-  }
   &:drop(active) {
     border-style: solid none;
     border-width: 1px;
-    border-color: mix($fg_color, $selected_bg_color, 50%);
+    border-color: $selected_borders_color;
+
+    &.after { border-top-style: none; }
+
+    &.before { border-bottom-style: none; }
   }
 
   &.expander {
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 443f688fa2..777f0cb8d6 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1991,18 +1991,14 @@ treeview.view {
   treeview.view:backdrop {
     border-left-color: #676b6b;
     border-top: #393f3f; }
-  treeview.view.before:drop(active) {
-    border-style: solid none none none;
-    border-width: 1px;
-    border-color: #88a6c4; }
-  treeview.view.after:drop(active) {
-    border-style: none none solid none;
-    border-width: 1px;
-    border-color: #88a6c4; }
   treeview.view:drop(active) {
     border-style: solid none;
     border-width: 1px;
-    border-color: #88a6c4; }
+    border-color: #0f2b48; }
+    treeview.view:drop(active).after {
+      border-top-style: none; }
+    treeview.view:drop(active).before {
+      border-bottom-style: none; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
     color: #b3b3b2; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index de708a609e..d7bb3e336a 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1998,18 +1998,14 @@ treeview.view {
   treeview.view:backdrop {
     border-left-color: #babbbb;
     border-top: #e8e8e7; }
-  treeview.view.before:drop(active) {
-    border-style: solid none none none;
-    border-width: 1px;
-    border-color: #3c6288; }
-  treeview.view.after:drop(active) {
-    border-style: none none solid none;
-    border-width: 1px;
-    border-color: #3c6288; }
   treeview.view:drop(active) {
     border-style: solid none;
     border-width: 1px;
-    border-color: #3c6288; }
+    border-color: #184472; }
+    treeview.view:drop(active).after {
+      border-top-style: none; }
+    treeview.view:drop(active).before {
+      border-bottom-style: none; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
     color: #6d7172; }
-- 
2.30.2