Skip to content

Commit 9606e11

Browse files
Restore Main_no_icons2 behavior for inline subitems (#1172)
1 parent 7f04293 commit 9606e11

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

Src/StartMenu/StartMenuDLL/MenuContainer.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ void CMenuContainer::AddStandardItems( void )
10711071
const StdMenuItem *pInlineParent=NULL;
10721072
int searchProviderIndex=-1;
10731073
m_SearchProvidersCount=0;
1074-
MenuSkin::TIconSize mainIconSize=s_Skin.Main_icon_size;
1074+
bool bSecondColumn=false;
10751075
for (const StdMenuItem *pStdItem=m_pStdItem;;pStdItem++)
10761076
{
10771077
if (pStdItem->id==MENU_LAST)
@@ -1089,9 +1089,8 @@ void CMenuContainer::AddStandardItems( void )
10891089
if (m_bSubMenu && pStdItem->id==s_ShutdownCommand)
10901090
continue;
10911091

1092-
const bool bTwoColumns = (!m_bSubMenu && s_Skin.TwoColumns);
1093-
if (pStdItem->id==MENU_COLUMN_BREAK && bTwoColumns)
1094-
mainIconSize=s_Skin.Main2_icon_size;
1092+
if (pStdItem->id==MENU_COLUMN_BREAK && !m_bSubMenu && s_Skin.TwoColumns)
1093+
bSecondColumn=true;
10951094

10961095
int stdOptions=GetStdOptions(pStdItem->id);
10971096
if (!(stdOptions&MENU_ENABLED)) continue;
@@ -1272,6 +1271,10 @@ void CMenuContainer::AddStandardItems( void )
12721271
item.bSplit=item.bFolder && (item.pStdItem->settings&StdMenuItem::MENU_SPLIT_BUTTON)!=0;
12731272

12741273
// get icon
1274+
MenuSkin::TIconSize mainIconSize=!bSecondColumn ? s_Skin.Main_icon_size : s_Skin.Main2_icon_size;
1275+
if (item.bInline && mainIconSize==MenuSkin::ICON_SIZE_NONE)
1276+
mainIconSize=s_Skin.Main_icon_size;
1277+
12751278
CItemManager::TIconSizeType iconSizeType;
12761279
int refreshFlags;
12771280
if (bSearchProvider7 || m_bSubMenu)

0 commit comments

Comments
 (0)