Fix toolbar image auto scaling, avoid enlarge external large enough t…

…oolbar images.
zufuliu · Apr 10, 2020 · 1b483f5 · 1b483f5
1 parent d28215f
commit 1b483f5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/src/Dialogs.c b/src/Dialogs.c
@@ -1765,7 +1765,7 @@ static INT_PTR CALLBACK SelectEncodingDlgProc(HWND hwnd, UINT umsg, WPARAM wPara
 		// we need to determine icon size first, then resize the encoding mask bitmap accordingly.
 
 		HBITMAP hbmp = (HBITMAP)LoadImage(g_hInstance, MAKEINTRESOURCE(IDB_ENCODING), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
-		hbmp = ResizeImageForCurrentDPI(hbmp);
+		hbmp = ResizeImageForCurrentDPI(hbmp, 16); // 32x16
 		BITMAP bmp;
 		GetObject(hbmp, sizeof(BITMAP), &bmp);
 		HIMAGELIST himl = ImageList_Create(bmp.bmHeight, bmp.bmHeight, ILC_COLOR32 | ILC_MASK, 0, 0);

diff --git a/src/Helpers.c b/src/Helpers.c
@@ -399,7 +399,7 @@ HBITMAP LoadBitmapFile(LPCWSTR path) {
 	return hbmp;
 }
 
-HBITMAP ResizeImageForDPI(HBITMAP hbmp, UINT dpi) {
+HBITMAP EnlargeImageForDPI(HBITMAP hbmp, UINT dpi) {
 	BITMAP bmp;
 	if (dpi > USER_DEFAULT_SCREEN_DPI && GetObject(hbmp, sizeof(BITMAP), &bmp)) {
 		const int width = MulDiv(dpi, bmp.bmWidth, USER_DEFAULT_SCREEN_DPI);
@@ -413,6 +413,21 @@ HBITMAP ResizeImageForDPI(HBITMAP hbmp, UINT dpi) {
 	return hbmp;
 }
 
+HBITMAP ResizeImageForDPI(HBITMAP hbmp, UINT dpi, int height) {
+	BITMAP bmp;
+	if (dpi > USER_DEFAULT_SCREEN_DPI && GetObject(hbmp, sizeof(BITMAP), &bmp)) {
+		height = MulDiv(dpi, height, USER_DEFAULT_SCREEN_DPI);
+		// keep aspect ratio
+		const int width = MulDiv(height, bmp.bmWidth, bmp.bmHeight);
+		HBITMAP hCopy = (HBITMAP)CopyImage(hbmp, IMAGE_BITMAP, width, height, LR_COPYRETURNORG | LR_COPYDELETEORG);
+		if (hCopy != NULL) {
+			hbmp = hCopy;
+		}
+	}
+
+	return hbmp;
+}
+
 //=============================================================================
 //
 // PrivateSetCurrentProcessExplicitAppUserModelID()
@@ -1092,7 +1107,7 @@ void MultilineEditSetup(HWND hwndDlg, int nCtlId) {
 void MakeBitmapButton(HWND hwnd, int nCtlId, HINSTANCE hInstance, WORD wBmpId) {
 	HWND hwndCtl = GetDlgItem(hwnd, nCtlId);
 	HBITMAP hBmp = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(wBmpId), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
-	hBmp = ResizeImageForCurrentDPI(hBmp);
+	hBmp = ResizeButtonImageForCurrentDPI(hBmp);
 	BITMAP bmp;
 	GetObject(hBmp, sizeof(BITMAP), &bmp);
 	BUTTON_IMAGELIST bi;

diff --git a/src/Helpers.h b/src/Helpers.h
@@ -476,9 +476,23 @@ BOOL IsElevated(void);
 #define SetExplorerTheme(hwnd)		SetWindowTheme((hwnd), L"Explorer", NULL)
 
 HBITMAP LoadBitmapFile(LPCWSTR path);
-HBITMAP ResizeImageForDPI(HBITMAP hbmp, UINT dpi);
-NP2_inline HBITMAP ResizeImageForCurrentDPI(HBITMAP hbmp) {
-	return ResizeImageForDPI(hbmp, g_uCurrentDPI);
+HBITMAP EnlargeImageForDPI(HBITMAP hbmp, UINT dpi);
+HBITMAP ResizeImageForDPI(HBITMAP hbmp, UINT dpi, int height);
+
+NP2_inline HBITMAP EnlargeImageForCurrentDPI(HBITMAP hbmp) {
+	return EnlargeImageForDPI(hbmp, g_uCurrentDPI);
+}
+
+NP2_inline HBITMAP ResizeImageForCurrentDPI(HBITMAP hbmp, int height) {
+	return ResizeImageForDPI(hbmp, g_uCurrentDPI, height);
+}
+
+NP2_inline HBITMAP ResizeButtonImageForCurrentDPI(HBITMAP hbmp) {
+	return ResizeImageForDPI(hbmp, g_uCurrentDPI, 16);
+}
+
+NP2_inline HBITMAP ResizeToolbarImageForCurrentDPI(HBITMAP hbmp) {
+	return ResizeImageForDPI(hbmp, g_uCurrentDPI, 16);
 }
 
 BOOL BitmapMergeAlpha(HBITMAP hbmp, COLORREF crDest);

diff --git a/src/Notepad2.c b/src/Notepad2.c
@@ -1808,7 +1808,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) {
 		hbmp = (HBITMAP)LoadImage(hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
 	}
 	if (bAutoScaleToolbar) {
-		hbmp = ResizeImageForCurrentDPI(hbmp);
+		hbmp = ResizeToolbarImageForCurrentDPI(hbmp);
 	}
 	HBITMAP hbmpCopy = NULL;
 	if (!bExternalBitmap) {
@@ -1827,7 +1827,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) {
 		hbmp = LoadBitmapFile(tchToolbarBitmapHot);
 		if (hbmp != NULL) {
 			if (bAutoScaleToolbar) {
-				hbmp = ResizeImageForCurrentDPI(hbmp);
+				hbmp = ResizeToolbarImageForCurrentDPI(hbmp);
 			}
 			GetObject(hbmp, sizeof(BITMAP), &bmp);
 			himl = ImageList_Create(bmp.bmHeight, bmp.bmHeight, ILC_COLOR32 | ILC_MASK, 0, 0);
@@ -1842,7 +1842,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) {
 		hbmp = LoadBitmapFile(tchToolbarBitmapDisabled);
 		if (hbmp != NULL) {
 			if (bAutoScaleToolbar) {
-				hbmp = ResizeImageForCurrentDPI(hbmp);
+				hbmp = ResizeToolbarImageForCurrentDPI(hbmp);
 			}
 			GetObject(hbmp, sizeof(BITMAP), &bmp);
 			himl = ImageList_Create(bmp.bmHeight, bmp.bmHeight, ILC_COLOR32 | ILC_MASK, 0, 0);