From 88d51a8604e55b98b5671da739ab3a31f4befb6b Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Fri, 4 Mar 2016 18:36:36 +0100
Subject: [PATCH] Adwaita: fix a thinko wrt fine-tune scales

added a scale node padding compensation for the trough growth in
fine-tune mode, so now the scale node doesn't grow anymore when
mark labels are present.
---
 gtk/theme/Adwaita/_common.scss           | 12 ++++++++++--
 gtk/theme/Adwaita/gtk-contained-dark.css |  6 ++++++
 gtk/theme/Adwaita/gtk-contained.css      |  6 ++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index b5c5fcdf7f..2c540db034 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2516,6 +2516,16 @@ scale {
   }
 
   &.fine-tune {
+    &.horizontal {
+      padding-top: 10px;
+      padding-bottom: 10px;
+    }
+
+    &.vertical {
+      padding-left: 10px;
+      padding-right: 10px;
+    }
+
     slider { margin: -6px; }
 
     fill,
@@ -2630,7 +2640,6 @@ scale {
       }
     }
   }
-
   &.horizontal {
     indicator {
       min-height: $_marks_lenght;
@@ -2645,7 +2654,6 @@ scale {
     }
     &.fine-tune indicator { min-width: ($_marks_lenght - 2px); }
   }
-
   // *WARNING* scale with marks madness following
 
   // FIXME: OSD and selected list rows missing, I don't feel like adding the other 144 assets needed for those...
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index daf4a793b7..2f89b759a4 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2615,6 +2615,12 @@ scale {
     min-height: 18px;
     min-width: 18px;
     margin: -8px; }
+  scale.fine-tune.horizontal {
+    padding-top: 10px;
+    padding-bottom: 10px; }
+  scale.fine-tune.vertical {
+    padding-left: 10px;
+    padding-right: 10px; }
   scale.fine-tune slider {
     margin: -6px; }
   scale.fine-tune fill,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 3d5324a649..17a373c062 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2646,6 +2646,12 @@ scale {
     min-height: 18px;
     min-width: 18px;
     margin: -8px; }
+  scale.fine-tune.horizontal {
+    padding-top: 10px;
+    padding-bottom: 10px; }
+  scale.fine-tune.vertical {
+    padding-left: 10px;
+    padding-right: 10px; }
   scale.fine-tune slider {
     margin: -6px; }
   scale.fine-tune fill,