@@ -1071,7 +1071,7 @@ void CMenuContainer::AddStandardItems( void )
1071
1071
const StdMenuItem *pInlineParent=NULL ;
1072
1072
int searchProviderIndex=-1 ;
1073
1073
m_SearchProvidersCount=0 ;
1074
- MenuSkin::TIconSize mainIconSize=s_Skin. Main_icon_size ;
1074
+ bool bSecondColumn= false ;
1075
1075
for (const StdMenuItem *pStdItem=m_pStdItem;;pStdItem++)
1076
1076
{
1077
1077
if (pStdItem->id ==MENU_LAST)
@@ -1089,9 +1089,8 @@ void CMenuContainer::AddStandardItems( void )
1089
1089
if (m_bSubMenu && pStdItem->id ==s_ShutdownCommand)
1090
1090
continue ;
1091
1091
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 ;
1095
1094
1096
1095
int stdOptions=GetStdOptions (pStdItem->id );
1097
1096
if (!(stdOptions&MENU_ENABLED)) continue ;
@@ -1272,6 +1271,10 @@ void CMenuContainer::AddStandardItems( void )
1272
1271
item.bSplit =item.bFolder && (item.pStdItem ->settings &StdMenuItem::MENU_SPLIT_BUTTON)!=0 ;
1273
1272
1274
1273
// 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
+
1275
1278
CItemManager::TIconSizeType iconSizeType;
1276
1279
int refreshFlags;
1277
1280
if (bSearchProvider7 || m_bSubMenu)
0 commit comments