Make 16x16 .ico files possible for toolbar

Author: Ekopalypse

PythonScript/src/ConfigFile.cpp

@@ -3,6 +3,7 @@
 #include "ConfigFile.h"
 #include "resource.h"
 #include "WcharMbcsConverter.h"
+#include "Utility.h"
 
 ConfigFile* ConfigFile::s_instance;
 
@@ -98,32 +99,7 @@ void ConfigFile::readConfig()
 					iconFullPath = expandPathIfNeeded(iconPath);
 					hBitmap = static_cast<HBITMAP>(LoadImage(NULL, iconFullPath.c_str(), IMAGE_BITMAP, 16, 16, LR_LOADMAP3DCOLORS | LR_LOADFROMFILE));
 					if (hBitmap == NULL) {
-						HICON hIcon = (HICON)LoadImage(NULL, iconFullPath.c_str(), IMAGE_ICON, 16, 16, LR_COLOR | LR_LOADFROMFILE);
-						if (hIcon) {
-							ICONINFO iconInfo;
-							if (GetIconInfo(hIcon, &iconInfo)) {
-								HDC hdc = GetDC(NULL);
-								if (hdc) {
-									HDC hdcMem = CreateCompatibleDC(hdc);
-									if (hdcMem) {
-										BITMAP bm{};
-										if (GetObject(iconInfo.hbmColor, sizeof(BITMAP), &bm)) {
-											hBitmap = CreateCompatibleBitmap(hdc, 16, 16);
-											if (hBitmap) {
-												HBITMAP hbmOld = (HBITMAP)SelectObject(hdcMem, hBitmap);
-												DrawIconEx(hdcMem, 0, 0, hIcon, 16, 16, 0, NULL, DI_NORMAL);
-												SelectObject(hdcMem, hbmOld);
-											}
-										}
-										DeleteDC(hdcMem);
-									}
-									ReleaseDC(NULL, hdc);
-								}
-								DeleteObject(iconInfo.hbmColor);
-								DeleteObject(iconInfo.hbmMask);
-							}
-							DestroyIcon(hIcon);
-						}
+						hBitmap = ConvertIconToBitmap(const_cast<LPWSTR>(iconFullPath.c_str()));
 					}
 				}
 				if (scriptFullPath != L"")

PythonScript/src/ShortcutDlg.cpp

@@ -5,7 +5,7 @@
 #include "resource.h"
 #include "MenuManager.h"
 #include "Notepad_plus_msgs.h"
-
+#include "Utility.h"
 
 ShortcutDlg::ShortcutDlg(HINSTANCE hInst, NppData& nppData, const TCHAR *scriptDirAppend)
 	: m_hTree(NULL),
@@ -604,32 +604,7 @@ void ShortcutDlg::toolbarSetIcon()
 			ConfigFile::ToolbarItemsTD::iterator it = m_toolbarItems.begin() + index;
 			HBITMAP hBitmap = (HBITMAP)LoadImage(NULL, ofn.lpstrFile, IMAGE_BITMAP, 16, 16, LR_COLOR | LR_LOADFROMFILE);
 			if (hBitmap == NULL) {
-				HICON hIcon = (HICON)LoadImage(NULL, ofn.lpstrFile, IMAGE_ICON, 16, 16, LR_COLOR | LR_LOADFROMFILE);
-				if (hIcon) {
-					ICONINFO iconInfo;
-					if (GetIconInfo(hIcon, &iconInfo)) {
-						HDC hdc = GetDC(NULL);
-						if (hdc) {
-							HDC hdcMem = CreateCompatibleDC(hdc);
-							if (hdcMem) {
-								BITMAP bm{};
-								if (GetObject(iconInfo.hbmColor, sizeof(BITMAP), &bm)) {
-									hBitmap = CreateCompatibleBitmap(hdc, 16, 16);
-									if (hBitmap) {
-										HBITMAP hbmOld = (HBITMAP)SelectObject(hdcMem, hBitmap);
-										DrawIconEx(hdcMem, 0, 0, hIcon, 16, 16, 0, NULL, DI_NORMAL);
-										SelectObject(hdcMem, hbmOld);
-									}
-								}
-								DeleteDC(hdcMem);
-							}
-							ReleaseDC(NULL, hdc);
-						}
-						DeleteObject(iconInfo.hbmColor);
-						DeleteObject(iconInfo.hbmMask);
-					}
-					DestroyIcon(hIcon);
-				}
+				hBitmap = ConvertIconToBitmap(ofn.lpstrFile);
 			}
 			it->second.first = hBitmap;
 			it->second.second = ofn.lpstrFile;

PythonScript/src/Utility.cpp

@@ -0,0 +1,33 @@
+#include "stdafx.h"
+#include "Utility.h"
+
+HBITMAP ConvertIconToBitmap(LPCWSTR file_path) {
+	HBITMAP hBitmap = nullptr;
+	HICON hIcon = (HICON)LoadImage(nullptr, file_path, IMAGE_ICON, 16, 16, LR_COLOR | LR_LOADFROMFILE);
+	if (hIcon) {
+		ICONINFO iconInfo;
+		if (GetIconInfo(hIcon, &iconInfo)) {
+			HDC hdc = GetDC(nullptr);
+			if (hdc) {
+				HDC hdcMem = CreateCompatibleDC(hdc);
+				if (hdcMem) {
+					BITMAP bm{};
+					if (GetObject(iconInfo.hbmColor, sizeof(BITMAP), &bm)) {
+						hBitmap = CreateCompatibleBitmap(hdc, 16, 16);
+						if (hBitmap) {
+							HBITMAP hbmOld = (HBITMAP)SelectObject(hdcMem, hBitmap);
+							DrawIconEx(hdcMem, 0, 0, hIcon, 16, 16, 0, nullptr, DI_NORMAL);
+							SelectObject(hdcMem, hbmOld);
+						}
+					}
+					DeleteDC(hdcMem);
+				}
+				ReleaseDC(nullptr, hdc);
+			}
+			DeleteObject(iconInfo.hbmColor);
+			DeleteObject(iconInfo.hbmMask);
+		}
+		DestroyIcon(hIcon);
+	}
+	return hBitmap;
+}

PythonScript/src/Utility.h

@@ -0,0 +1,7 @@
+#ifndef _PYTHONSCRIPT_UTILITY_H
+#define _PYTHONSCRIPT_UTILITY_H
+#endif
+
+#include <wtypes.h>
+
+HBITMAP ConvertIconToBitmap(LPCWSTR file_path);