fix: Fix scrollbars black border with "overlay_scroll_bars": "disabled"

Fix #1012
dezertdezine · Oct 31, 2016 · c3f53b2 · c3f53b2
1 parent 354d8e5
commit c3f53b2
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 46 deletions.
diff --git a/Material-Theme-Darker.sublime-theme b/Material-Theme-Darker.sublime-theme
@@ -913,9 +913,12 @@
 
     {
       "class": "scroll_bar_control",
-      "layer0.texture": "Material Theme/assets/darker/normal_bar_vertical.png",
-      "layer0.opacity": 1.0,
+      "layer0.tint": [33, 33, 33],
       "layer0.inner_margin": [0, 6],
+      "layer0.opacity": 1.0,
+      "layer1.texture": "Material Theme/assets/darker/normal_bar_vertical.png",
+      "layer1.opacity": 1.0,
+      "layer1.inner_margin": [0, 6],
       "blur": false
     },
 
@@ -935,9 +938,12 @@
     {
       "class": "scroll_bar_control",
       "attributes": ["horizontal"],
-      "layer0.texture": "Material Theme/assets/darker/normal_bar_horizontal.png",
+      "layer0.tint": [33, 33, 33],
+      "layer0.inner_margin": [0, 6],
       "layer0.opacity": 1.0,
-      "layer0.inner_margin": [6, 0],
+      "layer1.texture": "Material Theme/assets/darker/normal_bar_horizontal.png",
+      "layer1.opacity": 1.0,
+      "layer1.inner_margin": [6, 0],
       "blur": false
     },
 

diff --git a/Material-Theme-Lighter.sublime-theme b/Material-Theme-Lighter.sublime-theme
@@ -923,9 +923,12 @@
 
     {
       "class": "scroll_bar_control",
-      "layer0.texture": "Material Theme/assets/lighter/normal_bar_vertical.png",
-      "layer0.opacity": 1.0,
+      "layer0.tint": [250, 250, 250],
       "layer0.inner_margin": [0, 6],
+      "layer0.opacity": 1.0,
+      "layer1.texture": "Material Theme/assets/lighter/normal_bar_vertical.png",
+      "layer1.opacity": 1.0,
+      "layer1.inner_margin": [0, 6],
       "blur": false
     },
 
@@ -945,9 +948,12 @@
     {
       "class": "scroll_bar_control",
       "attributes": ["horizontal"],
-      "layer0.texture": "Material Theme/assets/lighter/normal_bar_horizontal.png",
+      "layer0.tint": [250, 250, 250],
+      "layer0.inner_margin": [0, 6],
       "layer0.opacity": 1.0,
-      "layer0.inner_margin": [6, 0],
+      "layer1.texture": "Material Theme/assets/lighter/normal_bar_horizontal.png",
+      "layer1.opacity": 1.0,
+      "layer1.inner_margin": [6, 0],
       "blur": false
     },
 

diff --git a/Material-Theme-Palenight.sublime-theme b/Material-Theme-Palenight.sublime-theme
@@ -928,9 +928,12 @@
 
     {
       "class": "scroll_bar_control",
-      "layer0.texture": "Material Theme/assets/palenight/normal_bar_vertical.png",
-      "layer0.opacity": 1.0,
+      "layer0.tint": [41, 45, 62],
       "layer0.inner_margin": [0, 6],
+      "layer0.opacity": 1.0,
+      "layer1.texture": "Material Theme/assets/palenight/normal_bar_vertical.png",
+      "layer1.opacity": 1.0,
+      "layer1.inner_margin": [0, 6],
       "blur": false
     },
 
@@ -950,9 +953,12 @@
     {
       "class": "scroll_bar_control",
       "attributes": ["horizontal"],
-      "layer0.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
+      "layer0.tint": [41, 45, 62],
+      "layer0.inner_margin": [0, 6],
       "layer0.opacity": 1.0,
-      "layer0.inner_margin": [6, 0],
+      "layer1.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
+      "layer1.opacity": 1.0,
+      "layer1.inner_margin": [6, 0],
       "blur": false
     },
 
@@ -981,7 +987,7 @@
 
     {
       "class": "puck_control",
-      "layer0.tint": [38, 50, 255, 255],
+      "layer0.tint": [41, 45, 62],
       "layer0.opacity": 1.0,
       "layer0.inner_margin": [10, 10],
       "layer1.texture": "Material Theme/assets/palenight/thumb_vertical.png",
@@ -996,9 +1002,12 @@
     {
       "class": "puck_control",
       "attributes": ["horizontal"],
-      "layer0.texture": "Material Theme/assets/palenight/thumb_horizontal.png",
+      "layer0.tint": [41, 45, 62],
       "layer0.opacity": 1.0,
-      "layer0.inner_margin": [10, 0],
+      "layer0.inner_margin": [10, 10],
+      "layer1.texture": "Material Theme/assets/palenight/thumb_horizontal.png",
+      "layer1.opacity": 1.0,
+      "layer1.inner_margin": [8, 8],
       "content_margin": [16, 6],
       "blur": false
     },
@@ -1034,19 +1043,18 @@
       "class": "scroll_bar_control",
       "settings": ["overlay_scroll_bars"],
       "layer0.texture": "Material Theme/assets/palenight/normal_bar_vertical.png",
-      "layer0.inner_margin": [0, 5],
-      "blur": true
+      "layer0.inner_margin": [0, 6]
     },
 
     {
       "class": "scroll_bar_control",
       "settings": ["overlay_scroll_bars"],
       "attributes": ["horizontal"],
       "layer0.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
-      "layer0.inner_margin": [5, 0],
+      "layer0.inner_margin": [6, 0],
       "layer0.opacity": 0.0,
       "layer1.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
-      "layer1.inner_margin": [5, 0],
+      "layer1.inner_margin": [6, 0],
       "layer1.opacity": 0.0,
       "blur": true
     },

diff --git a/Material-Theme.sublime-theme b/Material-Theme.sublime-theme
@@ -927,9 +927,12 @@
 
     {
       "class": "scroll_bar_control",
-      "layer0.texture": "Material Theme/assets/default/normal_bar_vertical.png",
-      "layer0.opacity": 1.0,
+      "layer0.tint": [38, 50, 56],
       "layer0.inner_margin": [0, 6],
+      "layer0.opacity": 1.0,
+      "layer1.texture": "Material Theme/assets/default/normal_bar_vertical.png",
+      "layer1.opacity": 1.0,
+      "layer1.inner_margin": [0, 6],
       "blur": false
     },
 
@@ -949,9 +952,12 @@
     {
       "class": "scroll_bar_control",
       "attributes": ["horizontal"],
-      "layer0.texture": "Material Theme/assets/default/normal_bar_horizontal.png",
+      "layer0.tint": [38, 50, 56],
+      "layer0.inner_margin": [0, 6],
       "layer0.opacity": 1.0,
-      "layer0.inner_margin": [6, 0],
+      "layer1.texture": "Material Theme/assets/default/normal_bar_horizontal.png",
+      "layer1.opacity": 1.0,
+      "layer1.inner_margin": [6, 0],
       "blur": false
     },
 

diff --git a/sources/themes/darker/scrollbars.json b/sources/themes/darker/scrollbars.json
@@ -7,9 +7,12 @@
 
   {
     "class": "scroll_bar_control",
-    "layer0.texture": "Material Theme/assets/darker/normal_bar_vertical.png",
-    "layer0.opacity": 1.0,
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
     "layer0.inner_margin": [0, 6],
+    "layer0.opacity": 1.0,
+    "layer1.texture": "Material Theme/assets/darker/normal_bar_vertical.png",
+    "layer1.opacity": 1.0,
+    "layer1.inner_margin": [0, 6],
     "blur": false
   },
 
@@ -29,9 +32,12 @@
   {
     "class": "scroll_bar_control",
     "attributes": ["horizontal"],
-    "layer0.texture": "Material Theme/assets/darker/normal_bar_horizontal.png",
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
+    "layer0.inner_margin": [0, 6],
     "layer0.opacity": 1.0,
-    "layer0.inner_margin": [6, 0],
+    "layer1.texture": "Material Theme/assets/darker/normal_bar_horizontal.png",
+    "layer1.opacity": 1.0,
+    "layer1.inner_margin": [6, 0],
     "blur": false
   },
 

diff --git a/sources/themes/default/scrollbars.json b/sources/themes/default/scrollbars.json
@@ -7,9 +7,12 @@
 
   {
     "class": "scroll_bar_control",
-    "layer0.texture": "Material Theme/assets/default/normal_bar_vertical.png",
-    "layer0.opacity": 1.0,
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
     "layer0.inner_margin": [0, 6],
+    "layer0.opacity": 1.0,
+    "layer1.texture": "Material Theme/assets/default/normal_bar_vertical.png",
+    "layer1.opacity": 1.0,
+    "layer1.inner_margin": [0, 6],
     "blur": false
   },
 
@@ -29,9 +32,12 @@
   {
     "class": "scroll_bar_control",
     "attributes": ["horizontal"],
-    "layer0.texture": "Material Theme/assets/default/normal_bar_horizontal.png",
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
+    "layer0.inner_margin": [0, 6],
     "layer0.opacity": 1.0,
-    "layer0.inner_margin": [6, 0],
+    "layer1.texture": "Material Theme/assets/default/normal_bar_horizontal.png",
+    "layer1.opacity": 1.0,
+    "layer1.inner_margin": [6, 0],
     "blur": false
   },
 

diff --git a/sources/themes/lighter/scrollbars.json b/sources/themes/lighter/scrollbars.json
@@ -7,9 +7,12 @@
 
   {
     "class": "scroll_bar_control",
-    "layer0.texture": "Material Theme/assets/lighter/normal_bar_vertical.png",
-    "layer0.opacity": 1.0,
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
     "layer0.inner_margin": [0, 6],
+    "layer0.opacity": 1.0,
+    "layer1.texture": "Material Theme/assets/lighter/normal_bar_vertical.png",
+    "layer1.opacity": 1.0,
+    "layer1.inner_margin": [0, 6],
     "blur": false
   },
 
@@ -29,9 +32,12 @@
   {
     "class": "scroll_bar_control",
     "attributes": ["horizontal"],
-    "layer0.texture": "Material Theme/assets/lighter/normal_bar_horizontal.png",
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
+    "layer0.inner_margin": [0, 6],
     "layer0.opacity": 1.0,
-    "layer0.inner_margin": [6, 0],
+    "layer1.texture": "Material Theme/assets/lighter/normal_bar_horizontal.png",
+    "layer1.opacity": 1.0,
+    "layer1.inner_margin": [6, 0],
     "blur": false
   },
 

diff --git a/sources/themes/palenight/scrollbars.json b/sources/themes/palenight/scrollbars.json
@@ -7,9 +7,12 @@
 
   {
     "class": "scroll_bar_control",
-    "layer0.texture": "Material Theme/assets/palenight/normal_bar_vertical.png",
-    "layer0.opacity": 1.0,
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
     "layer0.inner_margin": [0, 6],
+    "layer0.opacity": 1.0,
+    "layer1.texture": "Material Theme/assets/palenight/normal_bar_vertical.png",
+    "layer1.opacity": 1.0,
+    "layer1.inner_margin": [0, 6],
     "blur": false
   },
 
@@ -29,9 +32,12 @@
   {
     "class": "scroll_bar_control",
     "attributes": ["horizontal"],
-    "layer0.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
+    "layer0.inner_margin": [0, 6],
     "layer0.opacity": 1.0,
-    "layer0.inner_margin": [6, 0],
+    "layer1.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
+    "layer1.opacity": 1.0,
+    "layer1.inner_margin": [6, 0],
     "blur": false
   },
 
@@ -60,7 +66,7 @@
 
   {
     "class": "puck_control",
-    "layer0.tint": [38, 50, 255, 255],
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
     "layer0.opacity": 1.0,
     "layer0.inner_margin": [10, 10],
     "layer1.texture": "Material Theme/assets/palenight/thumb_vertical.png",
@@ -75,9 +81,12 @@
   {
     "class": "puck_control",
     "attributes": ["horizontal"],
-    "layer0.texture": "Material Theme/assets/palenight/thumb_horizontal.png",
+    "layer0.tint": [<%= ui.background.primary.rgb %>],
     "layer0.opacity": 1.0,
-    "layer0.inner_margin": [10, 0],
+    "layer0.inner_margin": [10, 10],
+    "layer1.texture": "Material Theme/assets/palenight/thumb_horizontal.png",
+    "layer1.opacity": 1.0,
+    "layer1.inner_margin": [8, 8],
     "content_margin": [16, 6],
     "blur": false
   },
@@ -113,19 +122,18 @@
     "class": "scroll_bar_control",
     "settings": ["overlay_scroll_bars"],
     "layer0.texture": "Material Theme/assets/palenight/normal_bar_vertical.png",
-    "layer0.inner_margin": [0, 5],
-    "blur": true
+    "layer0.inner_margin": [0, 6]
   },
 
   {
     "class": "scroll_bar_control",
     "settings": ["overlay_scroll_bars"],
     "attributes": ["horizontal"],
     "layer0.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
-    "layer0.inner_margin": [5, 0],
+    "layer0.inner_margin": [6, 0],
     "layer0.opacity": 0.0,
     "layer1.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
-    "layer1.inner_margin": [5, 0],
+    "layer1.inner_margin": [6, 0],
     "layer1.opacity": 0.0,
     "blur": true
   },