Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

ZRCola no longer responds to Ctrl+Alt shortcuts when invoked with AltGr

Browse Source
This commit is contained in:
Simon Rozman 2016-05-09 16:48:54 +02:00
parent ae3344d5eb
commit 50790ad01d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ZRCola/zrcolakeyhndlr.cpp
View File

@ -62,7 +62,12 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
if (pFrame && pFrame->GetStatusBar()) if (pFrame && pFrame->GetStatusBar())
pFrame->SetStatusText(wxEmptyString); pFrame->SetStatusText(wxEmptyString);
} }
} else if (e.GetUnicodeKey() || !e.HasAnyModifiers()) { } else if ((e.GetUnicodeKey() || !e.HasAnyModifiers())
#if defined(__WXMSW__)
&& ::GetKeyState(VK_RMENU) >= 0
#endif
)
{
ZRColaApp *app = (ZRColaApp*)wxTheApp; ZRColaApp *app = (ZRColaApp*)wxTheApp;
ZRCola::keyseq_db::indexKey::size_type start, end; ZRCola::keyseq_db::indexKey::size_type start, end;
bool found; bool found;
@ -132,7 +137,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
} }
} else if (event.GetEventType() == wxEVT_KEY_UP) { } else if (event.GetEventType() == wxEVT_KEY_UP) {
wxKeyEvent &e = (wxKeyEvent&)event; wxKeyEvent &e = (wxKeyEvent&)event;
if (e.GetKeyCode() == WXK_INSERT && m_is_insert) { if (m_is_insert && e.GetKeyCode() == WXK_INSERT) {
// Insert key has been depressed. // Insert key has been depressed.
wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame); wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame);
if (pFrame && pFrame->GetStatusBar()) if (pFrame && pFrame->GetStatusBar())