Skip to content

Commit b89aaed

Browse files
Fix corrupted icons in second column (#1088)
When using skin with a different second column icon size, all of the icons in it would become blank. Because m_bTwoColumns is set after AddStandardItems, it is still false in the column break check. As a workaround, use the value it's assigned later in InitWindowInternal instead. Fix #980
1 parent 47cc2b2 commit b89aaed

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Src/StartMenu/StartMenuDLL/MenuContainer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,8 @@ void CMenuContainer::AddStandardItems( void )
10841084
if (m_bSubMenu && pStdItem->id==s_ShutdownCommand)
10851085
continue;
10861086

1087-
if (pStdItem->id==MENU_COLUMN_BREAK && m_bTwoColumns)
1087+
const bool bTwoColumns = (!m_bSubMenu && s_Skin.TwoColumns);
1088+
if (pStdItem->id==MENU_COLUMN_BREAK && bTwoColumns)
10881089
mainIconSize=s_Skin.Main2_icon_size;
10891090

10901091
int stdOptions=GetStdOptions(pStdItem->id);

0 commit comments

Comments
 (0)