From b96ec3bf4152999154be5f7e27859cfe2656e05f Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 11 Feb 2022 15:15:26 +0800
Subject: [PATCH] light.msstyles: Do not use transparent edges for trackbar
 horizontal and vertical thumb.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 .../blue_trackbar_thumb_horizontal.bmp        | Bin 2418 -> 3918 bytes
 .../blue_trackbar_thumb_horizontal.svg        |  14 +++++++-------
 .../blue_trackbar_thumb_vertical.bmp          | Bin 4758 -> 3658 bytes
 .../blue_trackbar_thumb_vertical.svg          |  14 +++++++-------
 dlls/light.msstyles/light.rc                  |   4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp
index f3c8f55a9b2041f5d6b551124fb5d518218cb718..5a548024b186ab32f53fa15bd2903c46e5324526 100644
GIT binary patch
literal 3918
zcmeH}u}*_P7{|}V%|usULG925AE1kq4kpI>0IfPZ2|j_lh^Fxo8pJmcM(Yf7>)fPG
z2cgI3A4n;85OgAjaJjqQ_y7J}dtZK`*Ev4fVR5_1e21}xagDLTb}=*NY{wtcM2sap
z(y4QFdLtQr4L2pnVlj6d+ceFg*q}g17Je*T*X5j(*q}g179RNXhQtmXS$Oab;s!#5
zY~v9sA_n!Y&tLel?RU@f@|a~g1hKGTHxcI{l$7U&d6BGjRBy&`y7f_WtLo2QCG#{L
zlinq@MYnrGhw^wq(+S?aq@R;^AY@ZBbiEsS@;js+EVNeS$tp$b##3IRI@hP1A2sIZ
z;f&P%;u5JV4#6{QT8?KZz&PePoJ|7j(l-=eZwuW}g14)1{)IXRR-cas#C`dFz<vJl
zjK|@@4h4qff#tXVbQpQ`w!A|oMz--}>LD*{UY~M)3?<_5wZ}hS3NQnQqX8&|C!CD~
gt5?jk)d%hHG<O@BtyNt8|NDQtZ&dkvs=V9$07S=Y-T(jq

literal 2418
zcmeHJOHPD95XESW-ol*_H=}`tMqSLtl^ZYM9drX3PvG89GR_Sc2(VEPq9nTG=NW)b
zSp`!)lNmcRCMIs^@S2y`1tjl5HU0CeZLJx%INu;P5toQHZAV+j^Vb$m3j;K*J!l2`
zXBXECB};^jAJ)g?u@wYCPH<h<<dP_g;xtVmNfJQ*&bsgWwGaXb#98+|4|ovobbwWS
zQ2D9ypYsaCFq_Sb^)AQ%c@O_8M;PpyU>jKj<oq3ht;gUP(7-m{r0(do)R9m1N$upC
zPH+8K?t{Wl+nD<A=&~Pzy=P%o1!j;F=lhqB`(`yf$_T`zK01lT=L?9BXDCOfGRN}a
zpaxL^fw-){?{Qm&5_zY?YCfp^d^$$|Ux6|}|7DKlUC*k9hXv-96K9{P$5OAI@3(XP
kS>~wf1Ks}EI{I55RDQDm^p7(8e?t2pW>wHWNSvPf4R_|o;s5{u

diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg
index d1063507dd0..4aa6c26b068 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg id="bitmap:6-32" width="6" height="95" version="1.1" viewBox="0 0 1.5875 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<svg id="bitmap:11-24" width="11" height="105" version="1.1" viewBox="0 0 2.9104 27.781" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
     <dc:format>image/svg+xml</dc:format>
     <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
    </cc:Work>
   </rdf:RDF>
  </metadata>
+ <rect y="-.00023066" width="2.9104" height="27.781" fill="#fdffff" stroke-linejoin="round" stroke-width=".070004"/>
  <g stroke-width=".26458">
-  <rect x=".39688" y=".13229" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".39688" y="5.1594" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
-  <rect x=".39688" y="10.186" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
-  <rect x=".39688" y="15.214" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".39688" y="20.241" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
+  <rect x=".13229" y=".13206" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
+  <rect x=".13229" y="5.6883" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
+  <rect x=".13229" y="11.245" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13229" y="16.801" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
+  <rect x=".13229" y="22.357" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp
index b5c9d0f78a528afc15f2073d17e0a8fce6e1884a..32315aa00da3ac5ece65c2c7aa140f85b892cca5 100644
GIT binary patch
literal 3658
zcmeHKy-LGS82toS-2`7j?cfsKyA%W$L0TW6)!oU)Cvb0!QhbCG;|qxCXq}VQ)YX8c
zgNe7FCrznsK*E;}BF*Lg<c4#;bGhFkxwm|HuukK0h5iz418pB|g*MR>J+6(1RL4X~
zjo)**a&(>oWKLI8h~aS1?K+labtDCNu)rk@uInnLSW<uo3tU1ZDLD}W3tYmgCBk!9
zaF?FH=>9v-ljnKT6#nEN9zqDLLSnxT@Du+P{#|bW|9Ag#;ImQVW{EGh1Qqz}6At>s
zMwRs)0dpz?mQf?I@|2GUy+nDGXF?QwY364(54j_59dmO#PZr|*SBc+W;}E*gf55|d
zfls54eq^79rWP8zf@*5f!`W!?Mv>i6y*8_G?$4Y#QK5Rig)l)`OirSIeTFxCgf(Z1
z{RRNH;4iZOrbf|yUA^3iQ;7Wc+VBqi=SOxukN@ljyi3LTp*TMXFE7dGU~>QX>+|n7
Di7IQU

literal 4758
zcmeHJKTpC?5U<hE$;7qo*y@5|aFT(=$;GeYAgG_f*+7W)3y>6s_A~UK#u+{dv3)P+
zUEu}7guT}$L@pdx+TO44?tVY|x_5&!qqJB2enCG+zeYbYY~vW?>FPQjZWtKG@<ZpK
zdwc(|adD@^lb!D3-Q@ee6^3CloleDMGJ&d2`9ToG<MG(Un9k>Oi3S{_{Ml?);u1a=
zPpyS;RK4n)j;MO41507lg;_&Ci#q0B2S0g=X)c>;Crv4?DlYsrQa<8Dq)pN~X^N|*
znzdO_jXF*BY#%Ud&?e14)A^sgdS}?Ac^&*DJmPzE>f${Ko?Q!iZVWv~K;MPRzRZu{
z@zO+$1f7SsUW?GOzBS&m#;1#-a;@7~`}mtX@9mmPJST&`BQ^Dv_>&+nZH%cVekR0s
zo?@EIUc6md`9~+thi#D$T2R?3-|Iw+QQOSDn?!!S3y?YQ6@vNlb0pOI*m!C+;s>za
zf@;-is&{*ViSyFjPnv%wzdgyurMV-2h)0WI%f^`M;V0rD-<wkx?@5O}tv)3k_O$<Z
GPx}k^i?<a3

diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg
index 0ea443d89ef..f15c9fd1baa 100644
--- a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg
+++ b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg id="bitmap:21-32" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<svg id="bitmap:21-24" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
  <metadata>
   <rdf:RDF>
    <cc:Work rdf:about="">
     <dc:format>image/svg+xml</dc:format>
     <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
    </cc:Work>
   </rdf:RDF>
  </metadata>
+ <rect x="-9.0909e-6" y="2.2204e-16" width="5.5562" height="14.552" fill="#fdffff" stroke-linejoin="round" stroke-width=".070003"/>
  <g stroke-width=".26458">
-  <rect x=".13229" y=".39688" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".13229" y="3.3073" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/>
-  <rect x=".13229" y="6.2177" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/>
-  <rect x=".13229" y="9.1281" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
-  <rect x=".13229" y="12.039" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/>
+  <rect x=".13229" y=".13229" width="5.2916" height="2.6458" rx=".52916" ry=".52916" fill="#fff" stroke="#aeaeae"/>
+  <rect x=".13229" y="3.0427" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#3096fa"/>
+  <rect x=".13229" y="5.9531" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#2979ff" stroke="#2979ff"/>
+  <rect x=".13229" y="8.8635" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/>
+  <rect x=".13229" y="11.774" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc
index 4b196716171..4596f0f0458 100644
--- a/dlls/light.msstyles/light.rc
+++ b/dlls/light.msstyles/light.rc
@@ -1091,13 +1091,13 @@ BLUE_INI TEXTFILE
 "ImageFile = blue_trackbar_thumb_horizontal.bmp\r\n"
 "ImageCount = 5\r\n"
 "ImageLayout = Vertical\r\n"
-"SizingMargins = 2, 3, 2, 3\r\n"
+"SizingMargins = 1, 1, 1, 1\r\n"
 "SizingType = Tile\r\n"
 
 "[TrackBar.ThumbVert]\r\n"
 "BgType = ImageFile\r\n"
 "ImageFile = blue_trackbar_thumb_vertical.bmp\r\n"
-"SizingMargins = 2, 3, 2, 3\r\n"
+"SizingMargins = 1, 1, 1, 1\r\n"
 "SizingType = Stretch\r\n"
 "ImageCount = 5\r\n"
 "ImageLayout = Vertical\r\n"