Module: wine Branch: master Commit: cbc0d24f665fec3f44a4c08c0699d1356b754479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbc0d24f665fec3f44a4c08c0...
Author: Zhiyi Zhang zzhang@codeweavers.com Date: Fri Feb 11 15:14:30 2022 +0800
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
---
dlls/light.msstyles/blue_combobutton_glyph.bmp | Bin 1258 -> 1258 bytes dlls/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 2c0bd8a357f..251f3772bb8 100644 Binary files a/dlls/light.msstyles/blue_combobutton_glyph.bmp and b/dlls/light.msstyles/blue_combobutton_glyph.bmp differ 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:formatimage/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage%22/%3E - 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"