Select Apps icon based on Windows version

ge0rdi · ge0rdi · commit 344aa60893c4 · 2022-12-30T18:14:22.000+01:00
We now have nicer Apps icons for Win10/11 so we will select proper icon
based on Windows version.
diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp
@@ -1123,6 +1123,14 @@ const CItemManager::ItemInfo *CItemManager::GetCustomIcon( const wchar_t *path,
 		*c=0;
 		index=-_wtol(c+1);
 	}
+	// special handling for Apps icon
+	if (!text[0] && index==-IDI_APPSICON)
+	{
+		if (IsWin11())
+			index=-IDI_APPSICON11;
+		else if (GetWinVersion()==WIN_VER_WIN10)
+			index=-IDI_APPSICON10;
+	}
 	return GetCustomIcon(text,index,iconSizeType,false);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1123,6 +1123,14 @@ const CItemManager::ItemInfo CItemManager::GetCustomIcon( const wchar_t path,`
`1123`	`1123`	`*c=0;`
`1124`	`1124`	`index=-_wtol(c+1);`
`1125`	`1125`	`}`
	`1126`	`+ // special handling for Apps icon`
	`1127`	`+ if (!text[0] && index==-IDI_APPSICON)`
	`1128`	`+ {`
	`1129`	`+ if (IsWin11())`
	`1130`	`+ index=-IDI_APPSICON11;`
	`1131`	`+ else if (GetWinVersion()==WIN_VER_WIN10)`
	`1132`	`+ index=-IDI_APPSICON10;`
	`1133`	`+ }`
`1126`	`1134`	`return GetCustomIcon(text,index,iconSizeType,false);`
`1127`	`1135`	`}`
`1128`	`1136`