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

Bug 1557 - Win/Linux: Shortcuts for select/deselect all do not work in Mixer Board

Browse Source
This commit is contained in:
James Crook 2018-04-11 15:11:06 +01:00
parent 9cb593fe54
commit 68e4bf6c5e
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/commands/CommandManager.cpp
View File

@ -90,7 +90,11 @@ CommandManager. It holds the callback for one command.
#include "../AudacityException.h"
#include "../Prefs.h"
#include "../Project.h"
// LyricsPanel and MixerBoard both intercept keys, as if they were the TrackPanel.
// The mechanism of checking for the type of window here is klunky.
#include "../Lyrics.h"
#include "../MixerBoard.h"
#include "Keyboard.h"
#include "../PluginManager.h"
@ -99,6 +103,7 @@ CommandManager. It holds the callback for one command.
#include "../widgets/ErrorDialog.h"
#include "../widgets/HelpSystem.h"
// On wxGTK, there may be many many many plugins, but the menus don't automatically
// allow for scrolling, so we build sub-menus. If the menu gets longer than
// MAX_MENU_LEN, we put things in submenus that have MAX_SUBMENU_LEN items in them.
@ -1452,10 +1457,19 @@ bool CommandManager::FilterKeyEvent(AudacityProject *project, const wxKeyEvent &
return HandleCommandEntry(entry, NoFlagsSpecifed, NoFlagsSpecifed, &evt);
}
// Any other keypresses must be destined for this project window.
if (!permit &&
(wxGetTopLevelParent(wxWindow::FindFocus()) != project ||
!wxEventLoop::GetActive()->IsMain()))
wxWindow * pFocus = wxWindow::FindFocus();
wxWindow * pParent = wxGetTopLevelParent( pFocus );
bool validTarget = pParent == project;
// Bug 1557. MixerBoard should count as 'destined for project'
// MixerBoard IS a TopLevelWindow, and its parent is the project.
if( pParent && pParent->GetParent() == project){
if( dynamic_cast<MixerBoardFrame*>( pParent) != NULL )
validTarget = true;
}
validTarget = validTarget && wxEventLoop::GetActive()->IsMain();
// Any other keypresses must be destined for this project window
if (!permit && !validTarget )
{
return false;
}