Skip to content

Classic menu: allow more than two columns, and choose which column has the second-pane look #2580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emilioheredia-source wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Classic menu: allow more than two columns, and choose which column has the second-pane look #2580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4bdd81
Allow more than two columns in the Classic two-column main menu
emilioheredia-source Nov 7, 2026
8d6e2d1
Use the pager's column for its scroll range too
emilioheredia-source Nov 7, 2026
9ac6caa
Pin a drop on empty space only in the pinned programs' column
emilioheredia-source Nov 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Src/StartMenu/StartMenuDLL/DragDrop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,8 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::DragOver( DWORD grfKeyState, POINTL pt
}
else
{
if (!m_bSubMenu && index<m_OriginalCount && PtInRect(&m_rContent,p) && (s_pDragSource!=this || s_bDragFromTree || !s_bDragMovable || m_Items[m_DragIndex].id==MENU_RECENT))
RECT rScroll=GetScrollRect(); // a drop on empty space in the column of the pinned programs adds to them
if (!m_bSubMenu && index<m_OriginalCount && PtInRect(&rScroll,p) && (s_pDragSource!=this || s_bDragFromTree || !s_bDragMovable || m_Items[m_DragIndex].id==MENU_RECENT))
{
if (s_bWin7Style)
{
Expand Down
4 changes: 2 additions & 2 deletions Src/StartMenu/StartMenuDLL/MenuCommands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,9 +1497,9 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
{
// scroll the pager to make this item visible
RECT rc=item.itemRect;
OffsetRect(&rc,0,-m_rContent.top);
OffsetRect(&rc,0,-GetScrollRect().top);
int pos=m_ScrollOffset;
int total=m_Items[m_ScrollCount-1].itemRect.bottom-m_rContent.top-m_ScrollHeight;
int total=GetScrollRange();
if (pos>rc.top-m_ScrollButtonSize)
pos=rc.top-m_ScrollButtonSize;
else if (pos<rc.bottom+m_ScrollButtonSize-m_ScrollHeight)
Expand Down
Loading