From 62f5aa8e82b7c0f88f96529179d98533967ae8ad Mon Sep 17 00:00:00 2001
From: QwertyChouskie <asdfghrbljzmkd@outlook.com>
Date: Mon, 8 Jul 2019 19:11:37 -0700
Subject: [PATCH] Scrollbar: Improve appearance

---
 data/skins/Coal.stkskin            |  11 +++++++----
 data/skins/Forest.stkskin          |  11 +++++++----
 data/skins/Ocean.stkskin           |  11 +++++++----
 data/skins/Peach.stkskin           |  11 +++++++----
 data/skins/Ruby.stkskin            |  11 +++++++----
 data/skins/common/scrollbar_bg.png | Bin 1337 -> 1859 bytes
 6 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/data/skins/Coal.stkskin b/data/skins/Coal.stkskin
index bdc618d81..e4013d917 100644
--- a/data/skins/Coal.stkskin
+++ b/data/skins/Coal.stkskin
@@ -229,10 +229,13 @@ when the border that intersect at this corner are enabled.
 <!-- Scrollbars. Background and thumb have no state (always neutral state).
      The buttons are the top and bottom arrows. Image must be top arrow, will
      be mirrorred for bottom. Buttons can be in neutral or down state.
-     Advanced stretching is not used here.
-      -->
-<element type="scrollbar_background"          image="common/scrollbar_bg.png" />
-<element type="scrollbar_thumb"               image="coal/scrollbar_thumb.png" />
+     Advanced stretching is only used for the background and thumb. -->
+<element type="scrollbar_background"          image="common/scrollbar_bg.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="0.0" vborder_out_portion="0.0" />
+<element type="scrollbar_thumb"               image="coal/scrollbar_thumb.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="-1.0" vborder_out_portion="-1.0" />
 <element type="scrollbar_button"              image="common/scrollbar_btn.png" />
 <element type="scrollbar_button" state="down" image="coal/scrollbar_btn_down.png" />
 
diff --git a/data/skins/Forest.stkskin b/data/skins/Forest.stkskin
index 4d849d0fa..7b3fae7e9 100644
--- a/data/skins/Forest.stkskin
+++ b/data/skins/Forest.stkskin
@@ -229,10 +229,13 @@ when the border that intersect at this corner are enabled.
 <!-- Scrollbars. Background and thumb have no state (always neutral state).
      The buttons are the top and bottom arrows. Image must be top arrow, will
      be mirrorred for bottom. Buttons can be in neutral or down state.
-     Advanced stretching is not used here.
-      -->
-<element type="scrollbar_background"          image="common/scrollbar_bg.png" />
-<element type="scrollbar_thumb"               image="forest/scrollbar_thumb.png" />
+     Advanced stretching is only used for the background and thumb. -->
+<element type="scrollbar_background"          image="common/scrollbar_bg.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="0.0" vborder_out_portion="0.0" />
+<element type="scrollbar_thumb"               image="forest/scrollbar_thumb.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="-1.0" vborder_out_portion="-1.0" />
 <element type="scrollbar_button"              image="common/scrollbar_btn.png" />
 <element type="scrollbar_button" state="down" image="forest/scrollbar_btn_down.png" />
 
diff --git a/data/skins/Ocean.stkskin b/data/skins/Ocean.stkskin
index 7b7c7bb68..b2350daae 100644
--- a/data/skins/Ocean.stkskin
+++ b/data/skins/Ocean.stkskin
@@ -228,10 +228,13 @@ when the border that intersect at this corner are enabled.
 <!-- Scrollbars. Background and thumb have no state (always neutral state).
      The buttons are the top and bottom arrows. Image must be top arrow, will
      be mirrorred for bottom. Buttons can be in neutral or down state.
-     Advanced stretching is not used here.
-      -->
-<element type="scrollbar_background"          image="common/scrollbar_bg.png" />
-<element type="scrollbar_thumb"               image="ocean/scrollbar_thumb.png" />
+     Advanced stretching is only used for the background and thumb. -->
+<element type="scrollbar_background"          image="common/scrollbar_bg.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="0.0" vborder_out_portion="0.0" />
+<element type="scrollbar_thumb"               image="ocean/scrollbar_thumb.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="-1.0" vborder_out_portion="-1.0" />
 <element type="scrollbar_button"              image="common/scrollbar_btn.png" />
 <element type="scrollbar_button" state="down" image="ocean/scrollbar_btn_down.png" />
 
diff --git a/data/skins/Peach.stkskin b/data/skins/Peach.stkskin
index ee1be78a0..5489872be 100644
--- a/data/skins/Peach.stkskin
+++ b/data/skins/Peach.stkskin
@@ -226,10 +226,13 @@ when the border that intersect at this corner are enabled.
 <!-- Scrollbars. Background and thumb have no state (always neutral state).
      The buttons are the top and bottom arrows. Image must be top arrow, will
      be mirrorred for bottom. Buttons can be in neutral or down state.
-     Advanced stretching is not used here.
-      -->
-<element type="scrollbar_background"          image="common/scrollbar_bg.png" />
-<element type="scrollbar_thumb"               image="peach/scrollbar_thumb.png" />
+     Advanced stretching is only used for the background and thumb. -->
+<element type="scrollbar_background"          image="common/scrollbar_bg.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="0.0" vborder_out_portion="0.0" />
+<element type="scrollbar_thumb"               image="peach/scrollbar_thumb.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="-1.0" vborder_out_portion="-1.0" />
 <element type="scrollbar_button"              image="common/scrollbar_btn.png" />
 <element type="scrollbar_button" state="down" image="peach/scrollbar_btn_down.png" />
 
diff --git a/data/skins/Ruby.stkskin b/data/skins/Ruby.stkskin
index 47d34ad1b..896ee6bbc 100644
--- a/data/skins/Ruby.stkskin
+++ b/data/skins/Ruby.stkskin
@@ -227,10 +227,13 @@ when the border that intersect at this corner are enabled.
 <!-- Scrollbars. Background and thumb have no state (always neutral state).
      The buttons are the top and bottom arrows. Image must be top arrow, will
      be mirrorred for bottom. Buttons can be in neutral or down state.
-     Advanced stretching is not used here.
-      -->
-<element type="scrollbar_background"          image="common/scrollbar_bg.png" />
-<element type="scrollbar_thumb"               image="ruby/scrollbar_thumb.png" />
+     Advanced stretching is only used for the background and thumb. -->
+<element type="scrollbar_background"          image="common/scrollbar_bg.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="0.0" vborder_out_portion="0.0" />
+<element type="scrollbar_thumb"               image="ruby/scrollbar_thumb.png"
+    left_border="7" right_border="7" top_border="7" bottom_border="7"
+    hborder_out_portion="-1.0" vborder_out_portion="-1.0" />
 <element type="scrollbar_button"              image="common/scrollbar_btn.png" />
 <element type="scrollbar_button" state="down" image="ruby/scrollbar_btn_down.png" />
 
diff --git a/data/skins/common/scrollbar_bg.png b/data/skins/common/scrollbar_bg.png
index c224da819c9c59e124e5039d6d79f59190335950..ca626411681ad4f9bb58a4339fe46faf27dd23d9 100644
GIT binary patch
delta 1853
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

literal 1337
zcmV-91;+Y`P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igS!
z0}K`3w#Tdh001I%MObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakAa8CUVIWOmV~41B
zLjV8-i%CR5RCwCuSxrk+VH7@h=ABVzbQF_9L{qTHKoB>R<o}44L9}-pwCV@6kDz5g
z!;N7fh~PpjLCuAf1UkcvUo-diK0`+ihxd#(%%Jgs!+Gz0zwUGHIqzpwE>Gsx)^=~j
zaq_%SC_cS&=l1<<*10H(2=X_PB#CI#EORaWLYmD+<NNm?U+VSRhfF4VH#2khr*k<M
zHJkCPQmOyh?CfmM`1m;GayiOmG6djb{%3$V5XUi{pP##(ot=lPtE(?7m7`(LeId%{
z-IG#j;O*SpT&b(8i}v>R=;Y)?lkW&4ba!{t=;$b&o}SY3@^Yn8Ieg(f&GPj0bg{3m
zkG8h9=;-K(4i69M?Cgv>3Hf}U1_lON#+aO(Byj%tajEQlEEM|t`!ls#jq3F}?eFim
zLSSlYiv0Tv3ra}|c#!!H8g1z`w89_vDFwh!-Q3)~;0CVX4DRp%=dBa@_@G9kLBRa{
zd`o;t{2n}-S`bq#Y#2^!V@aKwgw|3pKFKsoHk;LgGA);1T3VvT#YJ#LSr{S$cgKwY
z948YK6ErwDNC3#95`>8xMu4`AAk&ry$h>ysAtrfFJLe#+bg@_jC&WE5xDAIs*iry0
z_4M>WgCyQ_1(1^;($-C-Apovxgow`L_H}=z0i=<1UGQU00KY@h1>8?|00L5n%35I{
z-*H_$r*(fp%yfTAvaNAgYdA8%q`C2c3o}`11Z@y$Ko+^+(P>FGEqOB}WWEI#c?8Jo
zk4A(1flQt?6M$A}Q>?$A)&Q51ht{G2?v6i3WmqmNJJ+#pd4VL&<wAp?bkjfj`#_rk
z(R6?G=~RZaruaxZ?sZzmyfzHL<qQw7#{m6ohk+yyF~<O&1xyc+uCHSs2+Z}IC)0YN
z14(TFKxj^f3}AVIY&SFr215Xq^;D*(B`f~<S?cQ;1Nd3%&=_DCz<XmHCoxumIyO2D
zniDvKdxkBi|3s%jbGq;v2wdi-0i3}dn;}x*4Uk;li?zSK2?96|5c<l4pq@eG_#$T=
zXx*OOr!fl%QgY+NTITDt{hZzanxI}a>T(dXZE1uM9A_x<ENypyfMJMK3n78fLI~yb
ztix%}*Hh$W>lSk%q%$=6kO2&$@|`UKFhMPnY{)RsX508?z*_OTB#@(GU3-8gZ>24<
zme{N<K^;xp+H3_4r~&Sd3<wfTTpJ`Ud46}L?XdO&o#vU0>*D+5(%gbG+@Cc|ni;_y
z8~8aTIHu80+5-_?m%l|CFKB!R&ipq49DN-hA4BUkzW%FMJ`xkqd2BH4{#Jc16WWXg
zIe{~hPP+*11h%)gX=G&NzdjTNS$QZ5PT;0P9GjtrzXM1-B0e+23F^VY!L=WY3;dH~
zaR3}a9-P75#c@*i1>)i1;cTH$Ag@~&BO4nV9d|J@G&Dq>BTk8NM-YQMJmB;C`g*Om
zx3@GlHioM)9F2GM)mXJ!C2$7!=<)o6{O3<!-`tSPQSz6g<S$2${pINU@}qkTu5sQ-
vvf0e*YPGVzva<5@+qc~taXs!izXSJQB)vH4+>(Vs00000NkvXXu0mjffi!Cz