Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use icons of correct sizes for wxART_FOLDER in wxMSW

Browse Source 
Don't restrict the sizes to just small or large icons but extract the
icon closest to the requested size using SHDefExtractIcon().
This commit is contained in:
Markus Juergens
2018-11-18 21:16:00 +01:00
committed by Vadim Zeitlin
parent d5cd939db7
commit 880b2b0a46
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/msw/artmsw.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/volume.h" #include "wx/volume.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include "wx/msw/wrapwin.h" #include "wx/msw/wrapwin.h"
#include "wx/msw/wrapshl.h"
#ifdef SHGSI_ICON #ifdef SHGSI_ICON
#define wxHAS_SHGetStockIconInfo #define wxHAS_SHGetStockIconInfo
@@ -90,24 +91,22 @@ MSWGetBitmapForPath(const wxString& path, const wxSize& size, DWORD uFlags = 0)
SHFILEINFO fi; SHFILEINFO fi;
wxZeroMemory(fi); wxZeroMemory(fi);
uFlags |= SHGFI_USEFILEATTRIBUTES | SHGFI_ICON; uFlags |= SHGFI_USEFILEATTRIBUTES | SHGFI_ICONLOCATION;
if ( size != wxDefaultSize )
{
if ( size.x <= 16 )
uFlags |= SHGFI_SMALLICON;
else if ( size.x >= 64 )
uFlags |= SHGFI_LARGEICON;
}
if ( !SHGetFileInfo(path.t_str(), FILE_ATTRIBUTE_DIRECTORY, if ( !SHGetFileInfo(path.t_str(), FILE_ATTRIBUTE_DIRECTORY,
&fi, sizeof(SHFILEINFO), uFlags) ) &fi, sizeof(SHFILEINFO), uFlags) )
return wxNullBitmap;
HICON hIcon = NULL;
if ( !SHDefExtractIcon(fi.szDisplayName, fi.iIcon, 0,
&hIcon, NULL, size.x) )
return wxNullBitmap; return wxNullBitmap;
wxIcon icon; wxIcon icon;
icon.CreateFromHICON((WXHICON)fi.hIcon); icon.CreateFromHICON((WXHICON)hIcon);
wxBitmap bitmap(icon); wxBitmap bitmap(icon);
::DestroyIcon(fi.hIcon); ::DestroyIcon(hIcon);
return bitmap; return bitmap;
} }