From 31fd41e547d96f361e325fe4b06bd1f9d735a7ab Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Sat, 5 Mar 2016 12:04:52 -0800
Subject: [PATCH] Adwaita: fix glitch in fine-tune scrollbar theming

The fine-tune mode should not change the overall dimensions of the
scrollbar.
---
 gtk/theme/Adwaita/_common.scss           | 12 ++++++++----
 gtk/theme/Adwaita/gtk-contained-dark.css |  7 +++++--
 gtk/theme/Adwaita/gtk-contained.css      |  7 +++++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a45b949c91..68e9bf3a7a 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2061,10 +2061,14 @@ scrollbar {
     &:disabled { background-color: transparent; }
   }
 
-  &.fine-tune slider {
-    min-width: 4px;
-    min-height: 4px;
-    border-width: 6px;
+  &.fine-tune {
+    slider {
+      min-width: 4px;
+      min-height: 4px;
+    }
+
+    &.horizontal slider { border-width: 5px 4px; }
+    &.vertical slider { border-width: 4px 5px; }
   }
 
   &.overlay-indicator {
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index fa44278bbb..cef3c771be 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2212,8 +2212,11 @@ scrollbar {
       background-color: transparent; }
   scrollbar.fine-tune slider {
     min-width: 4px;
-    min-height: 4px;
-    border-width: 6px; }
+    min-height: 4px; }
+  scrollbar.fine-tune.horizontal slider {
+    border-width: 5px 4px; }
+  scrollbar.fine-tune.vertical slider {
+    border-width: 4px 5px; }
   scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
     border-color: transparent;
     opacity: 0.4;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 4f0c68485f..7e8bb22823 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2222,8 +2222,11 @@ scrollbar {
       background-color: transparent; }
   scrollbar.fine-tune slider {
     min-width: 4px;
-    min-height: 4px;
-    border-width: 6px; }
+    min-height: 4px; }
+  scrollbar.fine-tune.horizontal slider {
+    border-width: 5px 4px; }
+  scrollbar.fine-tune.vertical slider {
+    border-width: 4px 5px; }
   scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
     border-color: transparent;
     opacity: 0.4;