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

Rewrote escape key handling, more like other Track Panel key handlers

Browse Source 
... and removed some abandoned spectral editing code
This commit is contained in:
Paul Licameli 2015-05-29 21:13:59 -04:00
parent d89944941b
commit 6ae8a656ab
3 changed files with 11 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Project.cpp
View File

@ -1879,6 +1879,9 @@ bool AudacityProject::HandleKeyDown(wxKeyEvent & event)
if (wxGetTopLevelParent(wxWindow::FindFocus()) != this)
return false;
if (event.GetKeyCode() == WXK_ESCAPE)
mTrackPanel->HandleEscapeKey(true);
if (event.GetKeyCode() == WXK_ALT)
mTrackPanel->HandleAltKey(true);
@ -1925,6 +1928,9 @@ bool AudacityProject::HandleKeyUp(wxKeyEvent & event)
if (wxGetTopLevelParent(wxWindow::FindFocus()) != this)
return false;
if (event.GetKeyCode() == WXK_ESCAPE)
mTrackPanel->HandleEscapeKey(false);
if (event.GetKeyCode() == WXK_ALT)
mTrackPanel->HandleAltKey(false);

59
src/TrackPanel.cpp
View File

@ -1565,8 +1565,11 @@ void TrackPanel::MakeParentResize()
mListener->TP_HandleResize();
}
void TrackPanel::HandleEscapeKey()
void TrackPanel::HandleEscapeKey(bool down)
{
if (!down)
return;
switch (mMouseCapture)
{
case IsSelecting:
@ -6335,60 +6338,6 @@ void TrackPanel::OnKeyDown(wxKeyEvent & event)
{
Track *t = GetFocusedTrack();
if (event.GetKeyCode() == WXK_ESCAPE) {
HandleEscapeKey();
return;
}
#ifdef EXPERIMENTAL_SPECTRAL_EDITING
#ifdef SPECTRAL_EDITING_ESC_KEY
// Test for pinning and unpinning of the center frequency
bool logF;
if (mAdjustSelectionEdges &&
event.GetKeyCode() == WXK_ESCAPE) {
if (mFreqSelMode == FREQ_SEL_SNAPPING_CENTER) {
// Toggle center snapping off
// (left click can also turn it off)
mFreqSelMode = FREQ_SEL_INVALID;
}
else if (isSpectrogramTrack(t, &logF)) {
WaveTrack *wt = static_cast<WaveTrack*>(t);
if (mFreqSelMode == FREQ_SEL_INVALID) {
// Toggle center snapping on (the only way to do this)
mFreqSelMode = FREQ_SEL_SNAPPING_CENTER;
StartSnappingFreqSelection(wt);
}
else {
// Handle ESC during frequency drag
wxMouseState state(::wxGetMouseState());
wxCoord yy = state.GetY();
ScreenToClient(NULL, &yy);
wxRect r;
if (wt == FindTrack(state.GetX(), yy, false, false, &r)) {
eFreqSelMode saveMode = mFreqSelMode;
mFreqSelMode = FREQ_SEL_PINNED_CENTER;
StartSnappingFreqSelection(wt);
MoveSnappingFreqSelection(yy, r.y, r.height, wt);
ExtendFreqSelection(yy, r.y, r.height);
UpdateSelectionDisplay();
mFreqSelMode = saveMode;
double hint = -1.0;
if (mFreqSelMode == FREQ_SEL_FREE) {
hint = PositionToFrequency
(true, yy, r.y, r.height, wt->GetRate(), logF);
}
ResetFreqSelectionPin(hint, logF);
// MakeParentModifyState(false);
}
}
// And don't skip event, yet
}
}
#endif
#endif
// Only deal with LabelTracks
if (!t || t->GetKind() != Track::Label) {
event.Skip();

2
src/TrackPanel.h
View File

@ -182,7 +182,7 @@ class AUDACITY_DLL_API TrackPanel:public wxPanel {
//virtual void SetSelectionFormat(int iformat)
//virtual void SetSnapTo(int snapto)
void HandleEscapeKey();
virtual void HandleEscapeKey(bool down);
virtual void HandleAltKey(bool down);
virtual void HandleShiftKey(bool down);
virtual void HandleControlKey(bool down);