Skip to content

Commit fad20ba

Browse files
committed
Activate start menu window only after search focus was set
Start menu window was activated early in the process of its creation. This means it was receiving input before focus was set to search bar. And that may have lead to unwanted use of keyboard accelerators. We need to make sure that window is activated (receives input) only once focus was set to search box. Fixes #1068
1 parent 2a7fc00 commit fad20ba

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Src/StartMenu/StartMenuDLL/MenuContainer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8237,7 +8237,7 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr
82378237
s_UserPicture.Init(pStartMenu);
82388238
}
82398239
dummyRc.right++;
8240-
pStartMenu->SetWindowPos(NULL,&dummyRc,SWP_NOZORDER);
8240+
pStartMenu->SetWindowPos(NULL,&dummyRc,SWP_NOZORDER|SWP_NOACTIVATE);
82418241

82428242
memset(&s_StartRect,0,sizeof(s_StartRect));
82438243

@@ -8566,7 +8566,7 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr
85668566
// reposition start menu
85678567
if (bTopMost || !s_bBehindTaskbar)
85688568
animFlags|=AW_TOPMOST;
8569-
pStartMenu->SetWindowPos((animFlags&AW_TOPMOST)?HWND_TOPMOST:HWND_TOP,corner.x,corner.y,0,0,(initialMonitor!=s_MenuMonitor && !bAllPrograms)?SWP_NOMOVE|SWP_NOSIZE:0);
8569+
pStartMenu->SetWindowPos((animFlags&AW_TOPMOST)?HWND_TOPMOST:HWND_TOP,corner.x,corner.y,0,0,((initialMonitor!=s_MenuMonitor && !bAllPrograms)?SWP_NOMOVE|SWP_NOSIZE:0)|SWP_NOACTIVATE);
85708570

85718571
pStartMenu->InitItems();
85728572
pStartMenu->m_MaxWidth=s_MainMenuLimits.right-s_MainMenuLimits.left;

0 commit comments

Comments
 (0)