timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-06-14 03:16:38 +10:00
Code Issues Packages Projects Releases Wiki Activity

Restore Main_no_icons2 behavior for inline subitems (#1172)

Browse Source
This commit is contained in:
among-us-official
2022-10-15 11:53:16 +03:00
committed by GitHub
parent 7f04293361
commit 9606e11e0e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/StartMenu/StartMenuDLL/MenuContainer.cpp
+7 -4
View File
@@ -1071,7 +1071,7 @@ void CMenuContainer::AddStandardItems( void )
const StdMenuItem *pInlineParent=NULL; const StdMenuItem *pInlineParent=NULL;
int searchProviderIndex=-1; int searchProviderIndex=-1;
m_SearchProvidersCount=0; m_SearchProvidersCount=0;
MenuSkin::TIconSize mainIconSize=s_Skin.Main_icon_size; bool bSecondColumn=false;
for (const StdMenuItem *pStdItem=m_pStdItem;;pStdItem++) for (const StdMenuItem *pStdItem=m_pStdItem;;pStdItem++)
{ {
if (pStdItem->id==MENU_LAST) if (pStdItem->id==MENU_LAST)
@@ -1089,9 +1089,8 @@ void CMenuContainer::AddStandardItems( void )
if (m_bSubMenu && pStdItem->id==s_ShutdownCommand) if (m_bSubMenu && pStdItem->id==s_ShutdownCommand)
continue; continue;
const bool bTwoColumns = (!m_bSubMenu && s_Skin.TwoColumns); if (pStdItem->id==MENU_COLUMN_BREAK && !m_bSubMenu && s_Skin.TwoColumns)
if (pStdItem->id==MENU_COLUMN_BREAK && bTwoColumns) bSecondColumn=true;
mainIconSize=s_Skin.Main2_icon_size;
int stdOptions=GetStdOptions(pStdItem->id); int stdOptions=GetStdOptions(pStdItem->id);
if (!(stdOptions&MENU_ENABLED)) continue; if (!(stdOptions&MENU_ENABLED)) continue;
@@ -1272,6 +1271,10 @@ void CMenuContainer::AddStandardItems( void )
item.bSplit=item.bFolder && (item.pStdItem->settings&StdMenuItem::MENU_SPLIT_BUTTON)!=0; item.bSplit=item.bFolder && (item.pStdItem->settings&StdMenuItem::MENU_SPLIT_BUTTON)!=0;
// get icon // get icon
MenuSkin::TIconSize mainIconSize=!bSecondColumn ? s_Skin.Main_icon_size : s_Skin.Main2_icon_size;
if (item.bInline && mainIconSize==MenuSkin::ICON_SIZE_NONE)
mainIconSize=s_Skin.Main_icon_size;
CItemManager::TIconSizeType iconSizeType; CItemManager::TIconSizeType iconSizeType;
int refreshFlags; int refreshFlags;
if (bSearchProvider7 || m_bSubMenu) if (bSearchProvider7 || m_bSubMenu)