From 54858574a3f925b817c7fe4b409326774852ad9c Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Fri, 4 Mar 2016 19:16:48 +0100
Subject: [PATCH] Adwaita: really fix scale with marks

added a min-height/width compensation too when in fine-tune mode,
so scale with marks and no labels doesn't make the scale node grow
when in fine-tune.
---
 gtk/theme/Adwaita/_common.scss           | 2 ++
 gtk/theme/Adwaita/gtk-contained-dark.css | 6 ++++--
 gtk/theme/Adwaita/gtk-contained.css      | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2c540db034..585f8771ed 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2519,11 +2519,13 @@ scale {
     &.horizontal {
       padding-top: 10px;
       padding-bottom: 10px;
+      min-height: 14px;
     }
 
     &.vertical {
       padding-left: 10px;
       padding-right: 10px;
+      min-width: 14px;
     }
 
     slider { margin: -6px; }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 2f89b759a4..f417afa6c8 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2617,10 +2617,12 @@ scale {
     margin: -8px; }
   scale.fine-tune.horizontal {
     padding-top: 10px;
-    padding-bottom: 10px; }
+    padding-bottom: 10px;
+    min-height: 14px; }
   scale.fine-tune.vertical {
     padding-left: 10px;
-    padding-right: 10px; }
+    padding-right: 10px;
+    min-width: 14px; }
   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 17a373c062..de663e02c4 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2648,10 +2648,12 @@ scale {
     margin: -8px; }
   scale.fine-tune.horizontal {
     padding-top: 10px;
-    padding-bottom: 10px; }
+    padding-bottom: 10px;
+    min-height: 14px; }
   scale.fine-tune.vertical {
     padding-left: 10px;
-    padding-right: 10px; }
+    padding-right: 10px;
+    min-width: 14px; }
   scale.fine-tune slider {
     margin: -6px; }
   scale.fine-tune fill,