Prettify Open popup menu #740

Sergy2001 · 2023-12-01T09:40:31Z

Dear Zufu Liu!

Would you be so kindly to add this function:

static HBITMAP getBitmapForFile(LPCWSTR path)
{
HBITMAP bitmap = nullptr;
SHFILEINFO sfi = { 0 };
HIMAGELIST imageList = (HIMAGELIST)SHGetFileInfo(path, FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(SHFILEINFO), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_SMALLICON);

if (imageList) {
	HDC dcDesktop = GetDC(nullptr);
	if (dcDesktop) {
		HDC dc = CreateCompatibleDC(dcDesktop);
		if (dc) {
			bitmap = CreateCompatibleBitmap(dcDesktop, 20, 20);
			HBITMAP oldBitmap = (HBITMAP)SelectObject(dc, bitmap);
			RECT rect = { 0, 0, 20, 20 };
			FillRect(dc, &rect, (HBRUSH)LongToPtr(COLOR_MENUBAR + 1));
			ImageList_Draw(imageList, sfi.iIcon, dc, 0, 0, ILD_TRANSPARENT);
			SelectObject(dc, oldBitmap);
			DeleteDC(dc);
		}
		ReleaseDC(nullptr, dcDesktop);
	}
}

return bitmap;

}

to Notepad2.c

And add line
SetMenuItemBitmaps(subMenu, i + IDM_RECENT_HISTORY_START, MF_BITMAP | MF_BYCOMMAND, getBitmapForFile(path), nullptr);

after (5350) AppendMenu(subMenu, MF_STRING, i + IDM_RECENT_HISTORY_START, path);

I hope It will prettify your Notepad2.

And please add snippets support?

Thanks.

The text was updated successfully, but these errors were encountered:

zufuliu · 2023-12-01T10:17:16Z

Not sure the impact of this change.

Sergy2001 · 2023-12-01T11:04:49Z

I add it to my build of Notepad2.
And it works...

Sergy2001 · 2023-12-01T22:30:12Z

I'm sorry. I forget that Notepad2 DPI aware program.
So corrected version of function:

static HBITMAP getBitmapForFile(LPCWSTR path)
{
const long const bitmapSize = MulDiv(16, g_uCurrentDPI, 96);
HBITMAP bitmap = nullptr;
SHFILEINFO sfi = { 0 };
HIMAGELIST imageList = (HIMAGELIST)SHGetFileInfo(path, FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(SHFILEINFO), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_SMALLICON);

if (imageList) {
	HDC dcDesktop = GetDC(nullptr);
	if (dcDesktop) {
		HDC dc = CreateCompatibleDC(dcDesktop);
		if (dc) {
			bitmap = CreateCompatibleBitmap(dcDesktop, bitmapSize, bitmapSize);
			HBITMAP oldBitmap = (HBITMAP)SelectObject(dc, bitmap);
			RECT rect = { 0, 0, bitmapSize, bitmapSize };
			FillRect(dc, &rect, (HBRUSH)LongToPtr(COLOR_MENUBAR + 1));
			ImageList_Draw(imageList, sfi.iIcon, dc, 0, 0, ILD_TRANSPARENT);
			SelectObject(dc, oldBitmap);
			DeleteDC(dc);
		}
		ReleaseDC(nullptr, dcDesktop);
	}
}

return bitmap;

}

zufuliu · 2023-12-01T23:25:19Z

It seems more code is needed:

When the menu is destroyed, these bitmaps are not destroyed; it is up to the application to destroy them.

per https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setmenuitembitmaps. also create bitmap for each file looks slow when some of them have same extension.

Sergy2001 · 2023-12-02T12:33:35Z

Ok! You are right.

The solution:
Line: 5351. add (, i) - getBitmapForFile(path, i)

case WM_DESTROY:
for (int i = 0; i < MRU_MAXITEMS; i++) // Clean up all handles.
getBitmapForFile(nullptr, i);

// New function.
static HBITMAP getBitmapForFile(LPCWSTR path, int index) {
static HBITMAP bitmaps[MRU_MAXITEMS] = { 0 };
if (bitmaps[index]) {
DeleteObject(bitmaps[index]);
bitmaps[index] = nullptr;
}
if (path == nullptr) // We just clean up handles.
return nullptr;

SHFILEINFO sfi = { 0 };
HIMAGELIST imageList = (HIMAGELIST)SHGetFileInfo(path, FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(SHFILEINFO), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_SMALLICON);

if (imageList) {
	HDC dcDesktop = GetDC(nullptr);
	if (dcDesktop) {
		HDC dc = CreateCompatibleDC(dcDesktop);
		if (dc) {
			long const bitmapSize = MulDiv(16, g_uCurrentDPI, 96);
			bitmaps[index] = CreateCompatibleBitmap(dcDesktop, bitmapSize, bitmapSize);
			HBITMAP oldBitmap = (HBITMAP)SelectObject(dc, bitmaps[index]);
			RECT rect = { 0, 0, bitmapSize, bitmapSize };
			FillRect(dc, &rect, (HBRUSH)LongToPtr(COLOR_MENUBAR + 1));
			ImageList_Draw(imageList, sfi.iIcon, dc, 0, 0, ILD_TRANSPARENT);
			SelectObject(dc, oldBitmap);
			DeleteDC(dc);
		}
		ReleaseDC(nullptr, dcDesktop);
	}
}

return bitmaps[index];

}

Sergy2001 · 2023-12-02T22:25:18Z

Another one variant with cache...

The solution:
Line: 5351. just - getBitmapForFile(path)

case WM_DESTROY:
getBitmapForFile(nullptr); // Clean up all handles.

struct BitmapCache {
int iIcon;
HBITMAP bitmap;
};

static HBITMAP getBitmapForFile(LPCWSTR path) {
static struct BitmapCache bitmapCaches[64] = { 0 };
SHFILEINFO sfi = { 0 };
HIMAGELIST imageList = (HIMAGELIST)SHGetFileInfo(path, FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(SHFILEINFO), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_SMALLICON);

for (int index = 0; index < 64; index++) {
	struct BitmapCache *bitmapHash = &bitmapCaches[index];
	if (!path && !imageList) { // Clean up cached bitmaps.
		if (bitmapHash->bitmap)
			DeleteBitmap(bitmapHash->bitmap);
		bitmapHash->bitmap = nullptr;
	} else if (imageList) {
		if (!bitmapHash->iIcon && !bitmapHash->bitmap) { // There is no cached bitmap.
			HDC dcDesktop = GetDC(nullptr);
			if (dcDesktop) {
				HDC dc = CreateCompatibleDC(dcDesktop);
				if (dc) {
					long const bitmapSize = MulDiv(16, g_uCurrentDPI, 96);
					bitmapHash->bitmap = CreateCompatibleBitmap(dcDesktop, bitmapSize, bitmapSize); // Cache bitmap.
					bitmapHash->iIcon = sfi.iIcon; // Cache bitmap index.
					HBITMAP oldBitmap = (HBITMAP)SelectObject(dc, bitmapHash->bitmap);
					RECT rect = { 0, 0, bitmapSize, bitmapSize };
					FillRect(dc, &rect, (HBRUSH)LongToPtr(COLOR_MENUBAR + 1));
					ImageList_Draw(imageList, sfi.iIcon, dc, 0, 0, ILD_TRANSPARENT);
					SelectObject(dc, oldBitmap);
					DeleteDC(dc);
				}
				ReleaseDC(nullptr, dcDesktop);
			}
			return bitmapHash->bitmap;
		}
		else if (bitmapHash->iIcon == sfi.iIcon)
			return bitmapHash->bitmap;
	}
}

return nullptr; // Somthing get wrong.

}

Sergy2001 · 2023-12-03T11:55:47Z

And one more thing...

When you click in MRU popup menu at non existing file, Notepad offers to create new file.
I suppose it would be better to do like in "Open Resent File" dialog.

The solution:
(5009) Replace with this.
if (path) {
if (FileSave(FileSaveFlag_Ask)) {
FileLoad(FileLoadFlag_DontSave, path);
}
}
____________________ With that ___________________
if (!PathIsFile(path)) {
// Ask...
if (IDYES == MsgBoxWarn(MB_YESNO, IDS_ERR_MRUDLG)) {
MRU_Delete(pFileMRU, index);
MRU_DeleteFileFromStore(pFileMRU, path);
}
} else if (FileSave(FileSaveFlag_Ask)) {
FileLoad(FileLoadFlag_DontSave, path);
}

@Sergy2001

Patch by @Sergy2001

zufuliu · 2023-12-03T12:20:53Z

When you click in MRU popup menu at non existing file, Notepad offers to create new file.

Committed the change as 2bdc014 with minor change to avoid use after free for path:

MRU_DeleteFileFromStore(pFileMRU, path);
MRU_Delete(pFileMRU, index);

Sergy2001 · 2023-12-04T21:17:11Z

Dear Zufu Liu!

Will you add getBitmapForFile() function(cached variant) to Notepad2?
I tested it and it works perfectly and destroys HBITMAP-s on VM_DESTROY.
Microsoft function SHGetFileInfo I use as hash one, because it always return sfi.iIcon which unique for every file extension.
So that we have simple hash for each file extension in system. imageList.count in my system returns 51 icons, that's why 64 elements in static struct BitmapCache bitmapCaches[64] = { 0 };

zufuliu · 2023-12-05T10:49:48Z

Will you add getBitmapForFile() function(cached variant) to Notepad2?

Yes, but with 32 (MRU_MAXITEMS) instead of 64.

zufuliu · 2023-12-09T23:56:00Z

Hi @Sergy2001, can you give email and name to author the change?

@Sergy2001

Co-authored-by: @Sergy2001

zufuliu · 2023-12-10T06:32:52Z

Another one variant with cache...

Committed the change as 361920b.

zufuliu · 2023-12-11T10:38:48Z

There seem needs extra fixes: the menu bitmap isn't transparent (compared to explorer's context menu) when the menu is selected:

Sergy2001 · 2023-12-11T14:22:04Z

Hello Zufu Liu!

My name is Serg(in French manner) or Sergio(in Italian manner). You can use just Sergy.

About transparency.
Of course I use function FillRect(dc, &rect, (HBRUSH)LongToPtr(COLOR_MENUBAR + 1));
Which fill bitmap with COLOR_MENUBAR.

Transparency:

BITMAPINFO bmi = { sizeof(BITMAPINFOHEADER), bitmapSize, bitmapSize, 1, 32, BI_RGB, bitmapSize * bitmapSize * 4, { 0 } };
bitmapHash->bitmap = CreateDIBSection(nullptr, (PBITMAPINFO)&bmi, DIB_RGB_COLORS, nullptr, nullptr, 0);

//bitmapHash->bitmap = CreateCompatibleBitmap(dcDesktop, bitmapSize, bitmapSize); // Cache bitmap.
bitmapHash->iIcon = sfi.iIcon; // Cache bitmap index.
HBITMAP oldBitmap = (HBITMAP)SelectObject(dc, bitmapHash->bitmap);
//RECT rect = { 0, 0, bitmapSize, bitmapSize };
//FillRect(dc, &rect, (HBRUSH)LongToPtr(COLOR_MENUBAR + 1));

zufuliu · 2023-12-12T10:21:39Z

Use COLOR_MENUBAR is same, image background is not set to selection color like TortoiseGit's menu (maybe it custom menu with png image).

Sergy2001 · 2023-12-12T16:13:14Z

Solution.

Comment lines in my function:
//bitmapHash->bitmap = CreateCompatibleBitmap(dcDesktop, bitmapSize, bitmapSize); // Cache bitmap.
//RECT rect = { 0, 0, bitmapSize, bitmapSize };
//FillRect(dc, &rect, (HBRUSH)LongToPtr(COLOR_MENUBAR + 1));

add those:
BITMAPINFO bmi = { sizeof(BITMAPINFOHEADER), bitmapSize, bitmapSize, 1, 32, BI_RGB, bitmapSize * bitmapSize * 4, { 0 } };
bitmapHash->bitmap = CreateDIBSection(nullptr, (PBITMAPINFO)&bmi, DIB_RGB_COLORS, nullptr, nullptr, 0); // Cache bitmap.

And it will work with transparency. I've already tried it. And it works.

zufuliu · 2023-12-13T11:23:41Z

image background is not set to selection color

I mean some like following, the file icon in menu doesn't change back color to light blue on selecting like it in Windows explorer (or it's right click menu), it still has the COLOR_MENUBAR or COLOR_MENU white color, which looks a little ugly.

COLOR_MENUBAR or CreateDIBSection doesn't fix this. directly load IDB_NEXT16 does not work either.

Sergy2001 · 2023-12-13T22:34:51Z

I understand what you mean. But in my build it works correctly.
Function:

struct BitmapCache {
int iIcon;
HBITMAP bitmap;
};

static HBITMAP getBitmapForFile(LPCWSTR path) {
static struct BitmapCache bitmapCaches[64] = { 0 };
SHFILEINFO sfi = { 0 };
HIMAGELIST imageList = (HIMAGELIST)SHGetFileInfo(path, FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(SHFILEINFO), SHGFI_USEFILEATTRIBUTES | SHGFI_SYSICONINDEX | SHGFI_SMALLICON);

for (int index = 0; index < 64; index++) {
	struct BitmapCache *bitmapHash = &bitmapCaches[index];
	if (!path && !imageList) { // Clean up cached bitmaps.
		if (bitmapHash->bitmap)
			DeleteBitmap(bitmapHash->bitmap);
		bitmapHash->bitmap = nullptr;
	} else if (imageList) {
		if (!bitmapHash->iIcon && !bitmapHash->bitmap) { // There is no cached bitmap.
			HDC dcDesktop = GetDC(nullptr);
			if (dcDesktop) {
				HDC dc = CreateCompatibleDC(dcDesktop);
				if (dc) {
					long const bitmapSize = MulDiv(16, g_uCurrentDPI, 96);
					BITMAPINFO bmi = { sizeof(BITMAPINFOHEADER), bitmapSize, bitmapSize, 1, 32, BI_RGB, bitmapSize * bitmapSize * 4, { 0 } };
					bitmapHash->bitmap = CreateDIBSection(nullptr, (PBITMAPINFO)&bmi, DIB_RGB_COLORS, nullptr, nullptr, 0); // Cache bitmap.
					bitmapHash->iIcon = sfi.iIcon; // Cache bitmap index.
					HBITMAP oldBitmap = (HBITMAP)SelectObject(dc, bitmapHash->bitmap);
					ImageList_Draw(imageList, sfi.iIcon, dc, 0, 0, ILD_TRANSPARENT);
					SelectObject(dc, oldBitmap);
					DeleteDC(dc);
				}
				ReleaseDC(nullptr, dcDesktop);
			}
			return bitmapHash->bitmap;
		}
		else if (bitmapHash->iIcon == sfi.iIcon)
			return bitmapHash->bitmap;
	}
}

return nullptr; // Somthing get wrong.

}

@Sergy2001

…n menu, issue #740. Patch by @Sergy2001

zufuliu · 2023-12-14T11:23:21Z

Thanks Serg 👍, it works now.

Sergy2001 · 2023-12-14T16:55:16Z

Thank you for your patience.

zufuliu added ✅enhancement ui labels Dec 1, 2023

zufuliu added this to the v4.24.01 milestone Dec 1, 2023

zufuliu added the 📝session/mru label Dec 3, 2023

zufuliu added a commit that referenced this issue Dec 3, 2023

On clicking, ask to delete non-existing path from MRU list, issue #740.

2bdc014

Patch by @Sergy2001

zufuliu added a commit that referenced this issue Dec 10, 2023

Show file icon on open file MRU drop-down menu items, issue #740.

361920b

Co-authored-by: @Sergy2001

zufuliu added a commit that referenced this issue Dec 14, 2023

Use CreateDIBSection() to make transparent bitmap for open drop-dow…

67eba8e

…n menu, issue #740. Patch by @Sergy2001

zufuliu closed this as completed Jan 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prettify Open popup menu #740

Prettify Open popup menu #740

Sergy2001 commented Dec 1, 2023

zufuliu commented Dec 1, 2023

Sergy2001 commented Dec 1, 2023

Sergy2001 commented Dec 1, 2023 •

edited

Loading

zufuliu commented Dec 1, 2023

Sergy2001 commented Dec 2, 2023

Sergy2001 commented Dec 2, 2023

Sergy2001 commented Dec 3, 2023

zufuliu commented Dec 3, 2023

Sergy2001 commented Dec 4, 2023

zufuliu commented Dec 5, 2023

zufuliu commented Dec 9, 2023

zufuliu commented Dec 10, 2023

zufuliu commented Dec 11, 2023

Sergy2001 commented Dec 11, 2023

zufuliu commented Dec 12, 2023

Sergy2001 commented Dec 12, 2023

zufuliu commented Dec 13, 2023

Sergy2001 commented Dec 13, 2023

zufuliu commented Dec 14, 2023

Sergy2001 commented Dec 14, 2023

Prettify Open popup menu #740

Prettify Open popup menu #740

Comments

Sergy2001 commented Dec 1, 2023

zufuliu commented Dec 1, 2023

Sergy2001 commented Dec 1, 2023

Sergy2001 commented Dec 1, 2023 • edited Loading

zufuliu commented Dec 1, 2023

Sergy2001 commented Dec 2, 2023

Sergy2001 commented Dec 2, 2023

Sergy2001 commented Dec 3, 2023

zufuliu commented Dec 3, 2023

Sergy2001 commented Dec 4, 2023

zufuliu commented Dec 5, 2023

zufuliu commented Dec 9, 2023

zufuliu commented Dec 10, 2023

zufuliu commented Dec 11, 2023

Sergy2001 commented Dec 11, 2023

zufuliu commented Dec 12, 2023

Sergy2001 commented Dec 12, 2023

zufuliu commented Dec 13, 2023

Sergy2001 commented Dec 13, 2023

zufuliu commented Dec 14, 2023

Sergy2001 commented Dec 14, 2023

Sergy2001 commented Dec 1, 2023 •

edited

Loading