Skip to content

W
wine-winehq
Commit 55d247ef authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

user32: Match cursor size in priority over color depth.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 06b90fe0
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
dlls/user32/cursoricon.c
View file @ 55d247ef
......@@ -580,11 +580,14 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_
{
if (cx > width || cy > height) continue;
if (cx < maxwidth || cy < maxheight) continue;
if (loadflags & LR_MONOCHROME)
if (cx == maxwidth && cy == maxheight)
{
if (maxbits && bits >= maxbits) continue;
if (loadflags & LR_MONOCHROME)
{
if (maxbits && bits >= maxbits) continue;
}
else if (bits <= maxbits) continue;
}
else if (bits <= maxbits) continue;
bestEntry = i;
maxwidth = cx;
maxheight = cy;
......@@ -598,11 +601,14 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_
for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ )
{
if (cx > maxwidth || cy > maxheight) continue;
if (loadflags & LR_MONOCHROME)
if (cx == maxwidth && cy == maxheight)
{
if (maxbits && bits >= maxbits) continue;
if (loadflags & LR_MONOCHROME)
{
if (maxbits && bits >= maxbits) continue;
}
else if (bits <= maxbits) continue;
}
else if (bits <= maxbits) continue;
bestEntry = i;
maxwidth = cx;
maxheight = cy;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment