From cbc0d24f665fec3f44a4c08c0699d1356b754479 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 11 Feb 2022 15:14:30 +0800
Subject: [PATCH] light.msstyles: Adjust scroll bar arrow width and height to
 17 pixels.

Themed scroll bar width and height are 17 pixels on XP. Fix that Light theme scroll bar arrow glyphs look off by 1
pixel. The combo button glyphs also have to be moved by 1 pixel because it was designed against the old scroll bar
arrow button width and height.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 .../light.msstyles/blue_combobutton_glyph.bmp | Bin 1258 -> 1258 bytes
 .../light.msstyles/blue_combobutton_glyph.svg |  27 ++++++++----------
 dlls/light.msstyles/light.rc                  |   4 +--
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/dlls/light.msstyles/blue_combobutton_glyph.bmp b/dlls/light.msstyles/blue_combobutton_glyph.bmp
index 2c0bd8a357fbffce7007fb3606beba2cf9a7b606..251f3772bb850b8c422c1c99665f5f4004dfc6e7 100644
GIT binary patch
literal 1258
zcmd5&I}U<C6kMZ~SJ22BdR=2jX=7#M3A}@?C$RNH+{PXPBwT=Fa0d?{hGv}yo5%_z
zHbyrL^LFOFN0`Ox)?>xl<Glm=z!2y#&br`@_EA=jVyt{fQ;X$#TQNT>8`pj`X*NYs
zWQSpxdY(5jo!2c00t-Ef@B0pM9LM9ATUOY^$s;C(_BHiFlkf)RRQaYEeB)ZxeqAf2
zY#;?%bAe|83E*h1<pP~+kJCS)9yRqslYo&6?lk*XxjZg&J3r0R>@si7B|FZn{4A2Y
z6b^BAnACE~T)_(uOu5j$rrz8Y^6pNJT#8v&{8cXa1sh0#)?DCOKms_LYq>z@+9Rez
S`)KC9S3)y#!JPwN$>j-~Je*+w

literal 1258
zcmd6jO>ToQ5QQBztDK>W-XP8iKy13|CMU=pDrJQd3wGTDQg<AHpL68~luGV52}HOc
z#G+DT@!2zPo{{{5x64{x*9UtD8+eA5dQnfDhi*<eSXQaqCz=gj_wR$@qH^-Li*CB6
zvMlquu0LJX?W(GZAS{Z);6J(3TgNOGPd^hc{kiYu<gSNy9BNXF5B%TyfA-ee9A<N2
z9zh5OCUZfL#nZo~^E$bpc`(Wa?F<i<%U7!N?@Z6;(j?ocO}Al_Xw#;<$y}Or7mKIQ
z<?79}lM8pfHqoP8T72+Ox$ur0W^-X4fxOwkWG?72+;gEe;N(K@!6=u`=X3t~`T;?t
Bf*t?>

diff --git a/dlls/light.msstyles/blue_combobutton_glyph.svg b/dlls/light.msstyles/blue_combobutton_glyph.svg
index 0caf1c4b696..b501a5496bd 100644
--- a/dlls/light.msstyles/blue_combobutton_glyph.svg
+++ b/dlls/light.msstyles/blue_combobutton_glyph.svg
@@ -5,24 +5,21 @@
    <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>
- <g>
-  <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/>
-  <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/>
-  <path d="m0.39688 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/>
-  <path d="m2.1173 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/>
-  <g>
-   <g stroke-width=".26458">
-    <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/>
-    <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/>
-    <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/>
-    <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/>
-   </g>
-   <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/>
-   <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/>
+ <path d="m0-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/>
+ <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/>
+ <path d="m0.52915 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/>
+ <path d="m2.2496 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/>
+ <g transform="translate(.13227)">
+  <g stroke-width=".26458">
+   <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/>
+   <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/>
+   <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/>
+   <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/>
   </g>
+  <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/>
+  <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/>
  </g>
 </svg>
diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc
index bfb04faf9e8..a8e35f9c5d7 100644
--- a/dlls/light.msstyles/light.rc
+++ b/dlls/light.msstyles/light.rc
@@ -144,8 +144,8 @@ BLUE_INI TEXTFILE
 "EdgeFillColor = 255 255 255\r\n"
 
 "\r\n[SysMetrics]\r\n"
-"ScrollbarWidth = 16\r\n"
-"ScrollbarHeight = 16\r\n"
+"ScrollbarWidth = 17\r\n"
+"ScrollbarHeight = 17\r\n"
 
 "\r\n; System colors\r\n"
 "Scrollbar = 255 255 255\r\n"