timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-22 02:50:22 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with confirmation dialog being blocked

Browse Source 
Delete confirmation dialog may be (partially) hidden behing start menu.
As a result the dialog may be not accessible because start menu(s) are
displayed as top-most windows.

Thus when executing menu command we will make menu(s) non-topmost. So that
other windows can be drawn on top of menu(s).

Fixes #257
This commit is contained in:
ge0rdi
2020-01-18 15:25:54 +01:00
parent 5f59aab40a
commit 9ebe53fdbf
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Src/StartMenu/StartMenuDLL/DragDrop.cpp
View File

@@ -852,9 +852,14 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf
CComQIPtr<IDataObjectAsyncCapability> pAsync=pDataObj; CComQIPtr<IDataObjectAsyncCapability> pAsync=pDataObj;
if (pAsync) if (pAsync)
pAsync->SetAsyncMode(FALSE); pAsync->SetAsyncMode(FALSE);
for (std::vector<CMenuContainer*>::iterator it=s_Menus.begin();it!=s_Menus.end();++it) for (auto& it : s_Menus)
if (!(*it)->m_bDestroyed) {
(*it)->EnableWindow(FALSE); // disable all menus if (!it->m_bDestroyed)
{
it->EnableWindow(FALSE); // disable all menus
it->SetWindowPos(HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
}
}
bool bAllPrograms=s_bAllPrograms; bool bAllPrograms=s_bAllPrograms;
if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,FALSE); if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,FALSE);
bool bOld=s_bPreventClosing; bool bOld=s_bPreventClosing;
@@ -862,9 +867,14 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf
AddRef(); AddRef();
pTarget->Drop(pDataObj,grfKeyState,pt,pdwEffect); pTarget->Drop(pDataObj,grfKeyState,pt,pdwEffect);
s_bPreventClosing=bOld; s_bPreventClosing=bOld;
for (std::vector<CMenuContainer*>::iterator it=s_Menus.begin();it!=s_Menus.end();++it) for (auto& it : s_Menus)
if (!(*it)->m_bDestroyed) {
(*it)->EnableWindow(TRUE); // enable all menus if (!it->m_bDestroyed)
{
it->EnableWindow(TRUE); // enable all menus
it->SetWindowPos(HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
}
}
if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,TRUE); if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,TRUE);
} }
else else

18
Src/StartMenu/StartMenuDLL/MenuCommands.cpp
View File

@@ -2800,8 +2800,11 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
info.fMask|=CMIC_MASK_NOASYNC; // wait for delete/link commands to finish so we can refresh the menu info.fMask|=CMIC_MASK_NOASYNC; // wait for delete/link commands to finish so we can refresh the menu
s_bPreventClosing=true; s_bPreventClosing=true;
for (std::vector<CMenuContainer*>::iterator it=s_Menus.begin();it!=s_Menus.end();++it) for (auto& it : s_Menus)
(*it)->EnableWindow(FALSE); // disable all menus {
it->EnableWindow(FALSE); // disable all menus
it->SetWindowPos(HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
}
bool bAllPrograms=s_bAllPrograms; bool bAllPrograms=s_bAllPrograms;
if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,FALSE); if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,FALSE);
info.hwnd=g_OwnerWindow; info.hwnd=g_OwnerWindow;
@@ -2846,9 +2849,14 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
} }
} }
} }
for (std::vector<CMenuContainer*>::iterator it=s_Menus.begin();it!=s_Menus.end();++it) for (auto& it : s_Menus)
if (!(*it)->m_bDestroyed) {
(*it)->EnableWindow(TRUE); // enable all menus if (!it->m_bDestroyed)
{
it->EnableWindow(TRUE); // enable all menus
it->SetWindowPos(HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
}
}
if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,TRUE); if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,TRUE);
if (bRefreshMain && m_bSubMenu) if (bRefreshMain && m_bSubMenu)
{ {