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

Bug 1664 - Two shortcut pairs do not work in focused Karaoke window

Browse Source
This commit is contained in:
James Crook 2017-08-15 23:09:31 +01:00
parent 672e36951c
commit e7d33e18a7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Lyrics.cpp
View File

@ -78,12 +78,12 @@ BEGIN_EVENT_TABLE(Lyrics, wxPanelWrapper)
// EVT_COMMAND_LEFT_CLICK(kHighlightTextCtrlID, Lyrics::OnHighlightTextCtrl) // EVT_COMMAND_LEFT_CLICK(kHighlightTextCtrlID, Lyrics::OnHighlightTextCtrl)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_CLASS(Lyrics, wxPanelWrapper) IMPLEMENT_CLASS(Lyrics, wxPanel)
Lyrics::Lyrics(wxWindow* parent, wxWindowID id, Lyrics::Lyrics(wxWindow* parent, wxWindowID id,
const wxPoint& pos /*= wxDefaultPosition*/, const wxPoint& pos /*= wxDefaultPosition*/,
const wxSize& size /*= wxDefaultSize*/): const wxSize& size /*= wxDefaultSize*/):
wxPanelWrapper(parent, id, pos, size), wxPanel(parent, id, pos, size, wxWANTS_CHARS),
mWidth(size.x), mHeight(size.y) mWidth(size.x), mHeight(size.y)
{ {
mKaraokeHeight = mHeight; mKaraokeHeight = mHeight;

2
src/Lyrics.h
View File

@ -58,7 +58,7 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
class Lyrics final : public wxPanelWrapper class Lyrics final : public wxPanel
{ {
DECLARE_DYNAMIC_CLASS(Lyrics) DECLARE_DYNAMIC_CLASS(Lyrics)

6
src/Menus.cpp
View File

@ -1921,7 +1921,11 @@ CommandFlag AudacityProject::GetFocusedFrame()
if (w == mTrackPanel) { if (w == mTrackPanel) {
return TrackPanelHasFocus; return TrackPanelHasFocus;
} }
// LIE if Lyrics window has focus.
// we want to act as if TrackPanel has focus.
if (w== mLyricsWindow) {
return TrackPanelHasFocus;
}
if (w == mToolManager->GetBotDock()) { if (w == mToolManager->GetBotDock()) {
return BotDockHasFocus; return BotDockHasFocus;
} }