Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-22 06:22:58 +02:00
Code Issues Releases Wiki Activity

Batting 1000 tonight...make sure navigation works on Windows.

Browse Source
This commit is contained in:
Leland Lucius
2015-08-04 22:41:52 -05:00
parent 64e1136f06
commit 4cd7757cf4
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/commands/CommandManager.cpp
View File

@@ -735,6 +735,7 @@ int CommandManager::NewIdentifier(wxString name,
tmpEntry->mask = mDefaultMask;
tmpEntry->enabled = true;
tmpEntry->wantevent = (label.Find(wxT("\twantevent")) != wxNOT_FOUND);
tmpEntry->ignoredown = (label.Find(wxT("\tignoredown")) != wxNOT_FOUND);
tmpEntry->isMeta = false;
// Key from preferences overridse the default key given
@@ -985,14 +986,18 @@ bool CommandManager::HandleKey(wxKeyEvent &evt, wxUint32 flags, wxUint32 mask)
{
wxString keyStr = KeyEventToKeyString(evt);
CommandListEntry *entry = mCommandKeyHash[keyStr];
if (evt.GetEventType() == wxEVT_KEY_DOWN)
{
return HandleCommandEntry( entry, flags, mask, &evt );
}
if (entry && entry->wantevent)
if (entry)
{
return HandleCommandEntry( entry, flags, mask, &evt );
if (evt.GetEventType() == wxEVT_KEY_DOWN && !entry->ignoredown)
{
return HandleCommandEntry( entry, flags, mask, &evt );
}
if (evt.GetEventType() == wxEVT_KEY_UP && (entry->wantevent || entry->ignoredown))
{
return HandleCommandEntry( entry, flags, mask, &evt );
}
}
return false;

1
src/commands/CommandManager.h
View File

@@ -58,6 +58,7 @@ struct CommandListEntry
int count;
bool enabled;
bool wantevent;
bool ignoredown;
bool isMeta;
wxUint32 flags;
wxUint32 mask;