Skip to content

Commit bb51db4

Browse files
committed
Provide a smaller bitmap icon for Win 10 and older
(cherry picked from commit e538989d0aec897da848d11ed845e7f6c3acf157)
1 parent aa3649d commit bb51db4

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/U_Npp_PreviewHTML.pas

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,10 @@ procedure TNppPluginPreviewHTML.DoNppnToolbarModification;
284284
tb: TToolbarIcons;
285285
tbDM: TTbIconsDarkMode;
286286
bmpData: TPngImage;
287+
bmpResName: String;
287288
hHDC: HDC;
288289
bmpX, bmpY, icoX, icoY: Integer;
290+
WinVerMajor, WinVerMinor, BuildNr: DWORD;
289291
begin
290292
hHDC := hNil;
291293
bmpData := TPngImage.Create;
@@ -297,7 +299,10 @@ procedure TNppPluginPreviewHTML.DoNppnToolbarModification;
297299
icoX := MulDiv(32, GetDeviceCaps(hHDC, LOGPIXELSX), 96);
298300
icoY := MulDiv(32, GetDeviceCaps(hHDC, LOGPIXELSY), 96);
299301
try
300-
bmpData.LoadFromResourceName(HInstance, 'TB_BMP_DATA');
302+
bmpResName := 'TB_BMP_DATA';
303+
if not IsAtLeastWindows11(WinVerMajor, WinVerMinor, BuildNr) then
304+
bmpResName := 'TB_BMP_16_DATA';
305+
bmpData.LoadFromResourceName(HInstance, bmpResName);
301306
ToolbarBmp.Assign(bmpData);
302307
ToolbarBmp.PixelFormat := pf32bit;
303308
tb.ToolbarBmp := CopyImage(ToolbarBmp.Handle, IMAGE_BITMAP, bmpX, bmpY, LR_COPYRETURNORG);

src/prj/PreviewHTML_TB.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
TB_PREVIEW_HTML BITMAP "PreviewHTML_TB.bmp"
22
TB_BMP_DATA RCDATA "PreviewHTML_TB.png"
3+
TB_BMP_16_DATA RCDATA "PreviewHTML_TB_16.png"
34
TB_PREVIEW_HTML_ICO_DM ICON "PreviewHTML_TB_Dark.ico"
45
TB_PREVIEW_HTML_ICO ICON "PreviewHTML_TB.ico"

src/prj/PreviewHTML_TB_16.png

1.06 KB
Loading

0 commit comments

Comments
 (0)