timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-13 20:28:31 +10:00
Code Issues Packages Projects Releases Wiki Activity

Don't make metro icons smaller if Invert metro icons is enabled

Browse Source 
There should be no need to make icons smaller.
This commit is contained in:
ge0rdi
2020-09-19 20:30:53 +02:00
parent 8a22282191
commit 2ca236c291
1 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Src/StartMenu/StartMenuDLL/ItemManager.cpp
View File

@@ -259,7 +259,6 @@ static HBITMAP BitmapFromMetroBitmap( HBITMAP hBitmap, int bitmapSize, DWORD met
HGDIOBJ bmp0=SelectObject(hdc,bmp); HGDIOBJ bmp0=SelectObject(hdc,bmp);
HGDIOBJ bmp02=SelectObject(hsrc,hBitmap); HGDIOBJ bmp02=SelectObject(hsrc,hBitmap);
int offset=(bitmapSize-info.bmWidth)/2; int offset=(bitmapSize-info.bmWidth)/2;
bool bInvert=g_bInvertMetroIcons;
if (g_bInvertMetroIcons && bGrayscale) if (g_bInvertMetroIcons && bGrayscale)
{ {
FillRect(hdc,&rc,(HBRUSH)GetStockObject(BLACK_BRUSH)); FillRect(hdc,&rc,(HBRUSH)GetStockObject(BLACK_BRUSH));
@@ -302,8 +301,7 @@ static HBITMAP BitmapFromMetroBitmap( HBITMAP hBitmap, int bitmapSize, DWORD met
static HBITMAP LoadMetroBitmap0( const wchar_t *path, int bitmapSize, DWORD metroColor ) static HBITMAP LoadMetroBitmap0( const wchar_t *path, int bitmapSize, DWORD metroColor )
{ {
int iconSize=g_bInvertMetroIcons?bitmapSize:(bitmapSize-2); SIZE size={-bitmapSize,bitmapSize};
SIZE size={-iconSize,iconSize};
HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL); HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL);
if (hBitmap) if (hBitmap)
{ {
@@ -440,16 +438,8 @@ static HBITMAP LoadMetroBitmap2( const wchar_t *location, int bitmapSize, DWORD
} }
if (iconSize) if (iconSize)
{ {
if (g_bInvertMetroIcons) if (iconSize>bitmapSize)
{ iconSize=bitmapSize;
if (iconSize>bitmapSize)
iconSize=bitmapSize;
}
else
{
if (iconSize>bitmapSize-2)
iconSize=bitmapSize-2;
}
SIZE size={iconSize,iconSize}; SIZE size={iconSize,iconSize};
HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL); HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL);
if (hBitmap) if (hBitmap)
@@ -2322,12 +2312,6 @@ void CItemManager::LoadShellIcon( IShellItem *pItem, int refreshFlags, const Ico
int smallIconSize=SMALL_ICON_SIZE; int smallIconSize=SMALL_ICON_SIZE;
int largeIconSize=LARGE_ICON_SIZE; int largeIconSize=LARGE_ICON_SIZE;
int extraLargeIconSize=EXTRA_LARGE_ICON_SIZE; int extraLargeIconSize=EXTRA_LARGE_ICON_SIZE;
if (pMetroColor)
{
smallIconSize-=2;
largeIconSize-=2;
extraLargeIconSize-=2;
}
HICON hSmallIcon=NULL, hLargeIcon=NULL, hExtraLargeIcon=NULL; HICON hSmallIcon=NULL, hLargeIcon=NULL, hExtraLargeIcon=NULL;
if (bNotFileName) if (bNotFileName)
{ {
@@ -2446,8 +2430,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic
if (FAILED(pResManager->GetDefaultContext(IID_ResourceContext,(void**)&pResContext))) if (FAILED(pResManager->GetDefaultContext(IID_ResourceContext,(void**)&pResContext)))
return; return;
int iconFlags=0; int iconFlags=0;
int delta=g_bInvertMetroIcons?0:2; if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,SMALL_ICON_SIZE))
if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,SMALL_ICON_SIZE-delta))
{ {
CComString pLocation; CComString pLocation;
if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation))) if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation)))
@@ -2457,7 +2440,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic
StoreInCache(hash,L"",hSmallBitmap,NULL,NULL,INFO_SMALL_ICON,smallIcon,largeIcon,extraLargeIcon,false,true); StoreInCache(hash,L"",hSmallBitmap,NULL,NULL,INFO_SMALL_ICON,smallIcon,largeIcon,extraLargeIcon,false,true);
} }
} }
if ((refreshFlags&INFO_LARGE_ICON) && SetResContextTargetSize(pResContext,LARGE_ICON_SIZE-delta)) if ((refreshFlags&INFO_LARGE_ICON) && SetResContextTargetSize(pResContext,LARGE_ICON_SIZE))
{ {
CComString pLocation; CComString pLocation;
if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation))) if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation)))
@@ -2467,7 +2450,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic
StoreInCache(hash,L"",NULL,hLargeBitmap,NULL,INFO_LARGE_ICON,smallIcon,largeIcon,extraLargeIcon,false,true); StoreInCache(hash,L"",NULL,hLargeBitmap,NULL,INFO_LARGE_ICON,smallIcon,largeIcon,extraLargeIcon,false,true);
} }
} }
if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE-delta)) if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE))
{ {
CComString pLocation; CComString pLocation;
if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation))) if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation)))