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

Merge branch 'msw-art-big-icons'

Browse Source 
Add support for big icons to the MSW art provider.

See https://github.com/wxWidgets/wxWidgets/pull/1025

Closes #18248.
This commit is contained in:
Vadim Zeitlin
2018-11-20 17:58:19 +01:00
parent 1c06a62830 ea28f00cb8
commit 1567632974
4 changed files with 111 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/msw/artmsw.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/volume.h"
#include "wx/msw/private.h"
#include "wx/msw/wrapwin.h"
#include "wx/msw/wrapshl.h"
#ifdef SHGSI_ICON
#define wxHAS_SHGetStockIconInfo
@@ -33,6 +34,39 @@
namespace
{
#ifdef SHDefExtractIcon
#define MSW_SHDefExtractIcon SHDefExtractIcon
#else // !defined(SHDefExtractIcon)
// MinGW doesn't provide SHDefExtractIcon() up to at least the 5.3 version, so
// define it ourselves.
HRESULT
MSW_SHDefExtractIcon(LPCTSTR pszIconFile, int iIndex, UINT uFlags,
HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize)
{
typedef HRESULT
(WINAPI *SHDefExtractIcon_t)(LPCTSTR, int, UINT, HICON*, HICON*, UINT);
static SHDefExtractIcon_t s_SHDefExtractIcon = NULL;
if ( !s_SHDefExtractIcon )
{
wxDynamicLibrary shell32(wxT("shell32.dll"));
wxDL_INIT_FUNC_AW(s_, SHDefExtractIcon, shell32);
if ( !s_SHDefExtractIcon )
return E_FAIL;
// Prevent the DLL from being unloaded while we use its function.
// Normally it's not a problem as shell32.dll is always loaded anyhow.
shell32.Detach();
}
return (*s_SHDefExtractIcon)(pszIconFile, iIndex, uFlags,
phiconLarge, phiconSmall, nIconSize);
}
#endif // !defined(SHDefExtractIcon)
#ifdef wxHAS_SHGetStockIconInfo
SHSTOCKICONID MSWGetStockIconIdForArtProviderId(const wxArtID& art_id)
@@ -51,6 +85,9 @@ SHSTOCKICONID MSWGetStockIconIdForArtProviderId(const wxArtID& art_id)
else if ( art_id == wxART_FLOPPY ) return SIID_DRIVE35;
else if ( art_id == wxART_CDROM ) return SIID_DRIVECD;
else if ( art_id == wxART_REMOVABLE ) return SIID_DRIVEREMOVE;
else if ( art_id == wxART_PRINT ) return SIID_PRINTER;
else if ( art_id == wxART_EXECUTABLE_FILE ) return SIID_APPLICATION;
else if ( art_id == wxART_NORMAL_FILE ) return SIID_DOCNOASSOC;
return SIID_INVALID;
};
@@ -81,32 +118,38 @@ MSW_SHGetStockIconInfo(SHSTOCKICONID siid,
#endif // #ifdef wxHAS_SHGetStockIconInfo
// Wrapper for SHDefExtractIcon().
wxBitmap
MSWGetBitmapFromIconLocation(const TCHAR* path, int index, const wxSize& size)
{
HICON hIcon = NULL;
if ( MSW_SHDefExtractIcon(path, index, 0, &hIcon, NULL, size.x) != S_OK )
return wxNullBitmap;
// Note that using "size.x" twice here is not a typo: normally size.y is
// the same anyhow, of course, but if it isn't, the actual icon size would
// be size.x in both directions as we only pass "x" to SHDefExtractIcon()
// above.
wxIcon icon;
if ( !icon.InitFromHICON((WXHICON)hIcon, size.x, size.x) )
return wxNullBitmap;
return wxBitmap(icon);
}
wxBitmap
MSWGetBitmapForPath(const wxString& path, const wxSize& size, DWORD uFlags = 0)
{
SHFILEINFO fi;
wxZeroMemory(fi);
uFlags |= SHGFI_USEFILEATTRIBUTES | SHGFI_ICON;
if ( size != wxDefaultSize )
{
if ( size.x <= 16 )
uFlags |= SHGFI_SMALLICON;
else if ( size.x >= 64 )
uFlags |= SHGFI_LARGEICON;
}
uFlags |= SHGFI_USEFILEATTRIBUTES | SHGFI_ICONLOCATION;
if ( !SHGetFileInfo(path.t_str(), FILE_ATTRIBUTE_DIRECTORY,
&fi, sizeof(SHFILEINFO), uFlags) )
return wxNullBitmap;
return wxNullBitmap;
wxIcon icon;
icon.CreateFromHICON((WXHICON)fi.hIcon);
wxBitmap bitmap(icon);
::DestroyIcon(fi.hIcon);
return bitmap;
return MSWGetBitmapFromIconLocation(fi.szDisplayName, fi.iIcon, size);
}
#if wxUSE_FSVOLUME
@@ -178,33 +221,21 @@ wxBitmap wxWindowsArtProvider::CreateBitmap(const wxArtID& id,
{
WinStruct<SHSTOCKICONINFO> sii;
UINT uFlags = SHGSI_ICON;
if ( size != wxDefaultSize )
{
if ( size.x <= 16 )
uFlags |= SHGSI_SMALLICON;
else if ( size.x >= 64 )
uFlags |= SHGSI_LARGEICON;
}
UINT uFlags = SHGSI_ICONLOCATION | SHGSI_SYSICONINDEX;
HRESULT res = MSW_SHGetStockIconInfo(stockIconId, uFlags, &sii);
if ( res == S_OK )
{
wxIcon icon;
icon.CreateFromHICON( (WXHICON)sii.hIcon );
bitmap = wxBitmap(icon);
::DestroyIcon(sii.hIcon);
const wxSize
sizeNeeded = size.IsFullySpecified()
? size
: wxArtProvider::GetNativeSizeHint(client);
bitmap = MSWGetBitmapFromIconLocation(sii.szPath, sii.iIcon,
sizeNeeded);
if ( bitmap.IsOk() )
{
const wxSize
sizeNeeded = size.IsFullySpecified()
? size
: wxArtProvider::GetNativeSizeHint(client);
if ( sizeNeeded.IsFullySpecified() &&
bitmap.GetSize() != sizeNeeded )
if ( bitmap.GetSize() != sizeNeeded )
{
wxArtProvider::RescaleBitmap(bitmap, sizeNeeded);
}