Merge pull request #2078 from RaiKoHoff/RC2_DEV

Fix missing DPI scaling selection mode
This commit is contained in:
Rainer Kottenhoff 2020-03-09 12:07:05 +01:00 committed by GitHub
commit e4997a7e82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2192,10 +2192,12 @@ static HIMAGELIST CreateScaledImageListFromBitmap(HWND hWnd, HBITMAP hBmp)
ImageList_AddMasked(himl, hBmp, CLR_DEFAULT);
DPI_T dpi = GetCurrentDPI(hWnd);
if ((dpi.x == USER_DEFAULT_SCREEN_DPI) && (dpi.y == USER_DEFAULT_SCREEN_DPI))
if (!Settings.DpiScaleToolBar ||
((dpi.x == USER_DEFAULT_SCREEN_DPI) && (dpi.y == USER_DEFAULT_SCREEN_DPI)))
{
return himl; // default DPI, we are done
}
// Scale button icons/images
int const scx = ScaleIntToCurrentDPIX(hWnd, cx);