light.msstyles: Fill checkbox background with white pixels.

Some window procedures don't actually erase background when WM_ERASEBKGND is received. So when drawing
transparent buttons on such windows, there may be left over content from buttons of different states.
This commit adds a white background to all the button parts that shouldn't be transparent.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52433
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2022-02-11 15:14:43 +08:00 committed by Alexandre Julliard
parent cbc0d24f66
commit 03e7ad417d
14 changed files with 36 additions and 52 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

View File

@ -5,10 +5,10 @@
<cc:Work rdf:about=""> <cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<rect width="13" height="156" fill="#fff" fill-opacity=".98444"/>
<g fill="none"> <g fill="none">
<path d="m0 0h24v24h-24z"/> <path d="m0 0h24v24h-24z"/>
<rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> <rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
@ -30,15 +30,11 @@
<rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> <rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/>
</g> </g>
<path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/> <path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/>
<g>
<path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/> <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/>
<path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/> <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/>
<path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/> <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/>
</g>
<path d="m2 110h9v1h-9z"/> <path d="m2 110h9v1h-9z"/>
<g>
<path d="m2 123h9v1h-9z" fill="#3096fa"/> <path d="m2 123h9v1h-9z" fill="#3096fa"/>
<path d="m2 136h9v1h-9z" fill="#2979ff"/> <path d="m2 136h9v1h-9z" fill="#2979ff"/>
<path d="m2 149h9v1h-9z" fill="#aeaeae"/> <path d="m2 149h9v1h-9z" fill="#aeaeae"/>
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -5,10 +5,10 @@
<cc:Work rdf:about=""> <cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<rect width="16" height="192" fill="#fff" fill-opacity=".98444"/>
<g fill="none"> <g fill="none">
<rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> <rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/>
<rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/>
@ -27,10 +27,8 @@
<path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/> <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/>
<path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/> <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/>
<path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> <path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/>
<g>
<path d="m2 135h12v2h-12z"/> <path d="m2 135h12v2h-12z"/>
<path d="m2 151h12v2h-12z" fill="#3096fa"/> <path d="m2 151h12v2h-12z" fill="#3096fa"/>
<path d="m2 167h12v2h-12z" fill="#2979ff"/> <path d="m2 167h12v2h-12z" fill="#2979ff"/>
<path d="m2 183h12v2h-12z"/> <path d="m2 183h12v2h-12z"/>
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -5,10 +5,10 @@
<cc:Work rdf:about=""> <cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<rect width="19" height="228" fill="#fff" fill-opacity=".98444"/>
<g transform="matrix(.95 0 0 .9499 .051376 .05137)" fill="none" stroke-width="1.0527"> <g transform="matrix(.95 0 0 .9499 .051376 .05137)" fill="none" stroke-width="1.0527">
<path d="m2.9e-6 0h36.923v36.965h-36.923z"/> <path d="m2.9e-6 0h36.923v36.965h-36.923z"/>
<rect x=".47226" y=".47227" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> <rect x=".47226" y=".47227" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/>

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -5,10 +5,10 @@
<cc:Work rdf:about=""> <cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<rect width="22" height="264" fill="#fff" fill-opacity=".98444"/>
<g transform="matrix(1.1 0 0 1.1001 .043576 .04358)" fill="none"> <g transform="matrix(1.1 0 0 1.1001 .043576 .04358)" fill="none">
<path d="m2.9e-6 0h36.923v36.965h-36.923z" stroke-width=".90907"/> <path d="m2.9e-6 0h36.923v36.965h-36.923z" stroke-width=".90907"/>
<rect transform="scale(1,-1)" x=".86945" y="-19.05" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> <rect transform="scale(1,-1)" x=".86945" y="-19.05" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/>

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -5,10 +5,10 @@
<cc:Work rdf:about=""> <cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<rect width="25" height="300" fill="#fff" fill-opacity=".98444"/>
<rect x="1" y="1" width="23" height="23" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> <rect x="1" y="1" width="23" height="23" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/>
<path d="m9.4091 116.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z"/> <path d="m9.4091 116.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z"/>
<path d="m4 211h17v3h-17z"/> <path d="m4 211h17v3h-17z"/>
@ -21,20 +21,16 @@
<rect x="1" y="151" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> <rect x="1" y="151" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/>
<rect x="1" y="176" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> <rect x="1" y="176" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/>
</g> </g>
<g>
<path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/> <path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/>
<path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/> <path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/>
<path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/> <path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/>
</g>
<g fill="none" stroke-width="2"> <g fill="none" stroke-width="2">
<rect x="1" y="201" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> <rect x="1" y="201" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/>
<rect x="1" y="226" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> <rect x="1" y="226" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/>
<rect x="1" y="251" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> <rect x="1" y="251" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/>
<rect x="1" y="276" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> <rect x="1" y="276" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/>
</g> </g>
<g>
<path d="m4 236h17v3h-17z" fill="#3096fa"/> <path d="m4 236h17v3h-17z" fill="#3096fa"/>
<path d="m4 261h17v3h-17z" fill="#2979ff"/> <path d="m4 261h17v3h-17z" fill="#2979ff"/>
<path d="m4 286h17v3h-17z" fill="#aeaeae"/> <path d="m4 286h17v3h-17z" fill="#aeaeae"/>
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

View File

@ -5,10 +5,10 @@
<cc:Work rdf:about=""> <cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<rect width="28" height="336" fill="#fff" fill-opacity=".98444"/>
<rect x=".99999" y="1" width="26" height="26" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> <rect x=".99999" y="1" width="26" height="26" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/>
<path d="m10.045 130.87-4.534-4.7014-1.5114 1.5672 6.0454 6.2686 12.955-13.433-1.5114-1.5672z"/> <path d="m10.045 130.87-4.534-4.7014-1.5114 1.5672 6.0454 6.2686 12.955-13.433-1.5114-1.5672z"/>
<path d="m4 237h20v2h-20z"/> <path d="m4 237h20v2h-20z"/>
@ -32,9 +32,9 @@
<rect x="1.0113" y="250.81" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#2979ff"/> <rect x="1.0113" y="250.81" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#2979ff"/>
<rect x="1.0113" y="275.79" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#aeaeae"/> <rect x="1.0113" y="275.79" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#aeaeae"/>
</g> </g>
<g transform="matrix(1.1765 0 0 1.1208 -.70588 -.12081)"> <g transform="matrix(1.1765 0 0 1.1208 -.70588 -.12081)" stroke-width=".77367">
<path d="m4 236.54h17v1.7844h-17z" fill="#3096fa" stroke-width=".77367"/> <path d="m4 236.54h17v1.7844h-17z" fill="#3096fa"/>
<path d="m4 261.53h17v1.7844h-17z" fill="#2979ff" stroke-width=".77367"/> <path d="m4 261.53h17v1.7844h-17z" fill="#2979ff"/>
<path d="m4 286.51h17v1.7844h-17z" fill="#aeaeae" stroke-width=".77367"/> <path d="m4 286.51h17v1.7844h-17z" fill="#aeaeae"/>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

View File

@ -5,26 +5,22 @@
<cc:Work rdf:about=""> <cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<rect width="31" height="372" fill="#fff" fill-opacity=".98444"/>
<rect x="1" y="1" width="29" height="29" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> <rect x="1" y="1" width="29" height="29" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/>
<path d="m11.682 144.66-5.0112-5.0148-1.6705 1.6717 6.6816 6.6864 14.318-14.328-1.6705-1.6717z"/> <path d="m11.682 144.66-5.0112-5.0148-1.6705 1.6717 6.6816 6.6864 14.318-14.328-1.6705-1.6717z"/>
<path d="m5 262h21v3h-21z"/> <path d="m5 262h21v3h-21z"/>
<g transform="matrix(1.2787 0 0 1.2336 -.27878 -.23525)" fill="none" stroke-width="1.5924"> <g transform="matrix(1.2787 0 0 1.2336 -.27878 -.23525)" fill="none" stroke-width="1.5924">
<g>
<rect x="1.0142" y="26.116" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> <rect x="1.0142" y="26.116" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/>
<rect x="1.0142" y="51.246" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> <rect x="1.0142" y="51.246" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/>
<rect x="1.0142" y="76.375" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> <rect x="1.0142" y="76.375" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/>
</g>
<rect x="1.0142" y="101.5" width="22.68" height="23.508" rx="1.5641" ry="1.6213" fill="none" stroke="#aeaeae"/> <rect x="1.0142" y="101.5" width="22.68" height="23.508" rx="1.5641" ry="1.6213" fill="none" stroke="#aeaeae"/>
<g>
<rect x="1.0284" y="126.62" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> <rect x="1.0284" y="126.62" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/>
<rect x="1.0284" y="151.75" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> <rect x="1.0284" y="151.75" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/>
<rect x="1.0284" y="176.88" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> <rect x="1.0284" y="176.88" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/>
</g> </g>
</g>
<g transform="matrix(1.2494 0 0 1.2335 .4349 -.23356)" stroke-width=".6481"> <g transform="matrix(1.2494 0 0 1.2335 .4349 -.23356)" stroke-width=".6481">
<path d="m9.0017 142.59-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#3096fa"/> <path d="m9.0017 142.59-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#3096fa"/>
<path d="m9.0017 167.72-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#2979ff"/> <path d="m9.0017 167.72-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#2979ff"/>
@ -32,12 +28,10 @@
</g> </g>
<g transform="matrix(1.2522 0 0 1.2335 -.2522 -.23356)" fill="none" stroke-width="1.6092"> <g transform="matrix(1.2522 0 0 1.2335 -.2522 -.23356)" fill="none" stroke-width="1.6092">
<rect x="1.006" y="202.04" width="23.16" height="23.509" rx="1.5972" ry="1.6213" fill="none" stroke="#aeaeae"/> <rect x="1.006" y="202.04" width="23.16" height="23.509" rx="1.5972" ry="1.6213" fill="none" stroke="#aeaeae"/>
<g>
<rect x="1.0205" y="227.16" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#3096fa"/> <rect x="1.0205" y="227.16" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#3096fa"/>
<rect x="1.0205" y="252.29" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#2979ff"/> <rect x="1.0205" y="252.29" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#2979ff"/>
<rect x="1.0205" y="277.42" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#aeaeae"/> <rect x="1.0205" y="277.42" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#aeaeae"/>
</g> </g>
</g>
<g transform="matrix(1.3032 0 0 1.2335 -.88963 -.23356)" stroke-width=".70069"> <g transform="matrix(1.3032 0 0 1.2335 -.88963 -.23356)" stroke-width=".70069">
<path d="m4.5192 237.72h16.114v2.432h-16.114z" fill="#3096fa"/> <path d="m4.5192 237.72h16.114v2.432h-16.114z" fill="#3096fa"/>
<path d="m4.5192 262.85h16.114v2.432h-16.114z" fill="#2979ff"/> <path d="m4.5192 262.85h16.114v2.432h-16.114z" fill="#2979ff"/>

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB