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

Simply toplevel window cycling

Browse Source 
It never really worked right on GTK and MAC, so remove all of the
specific code for them and just allow it to work on Windows until
a correct solution is found.

(GTK and MAC have their own cycling key combos anyway)
This commit is contained in:
lllucius@gmail.com 2014-12-09 05:16:48 +00:00
parent 8f5084b665
commit cbe0e38896
1 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Menus.cpp
View File

@ -2765,32 +2765,14 @@ void AudacityProject::NextWindow()
iter = iter->GetNext();
}
// Ran out of siblings, so make the current project's track panel active
// Ran out of siblings, so make the current project active
if (!iter)
{
#if defined(__WXGTK__)
// In wxGTK-2.8.12, focus gets lost if you don't set it to the project window
// instead of the track panel. No idea why.
w = this;
#else
w = mTrackPanel;
#endif
}
#if !defined(__WXMSW__)
// Move focus to the window and bring it to the fore. We don't do it on Windows
// because the Raise() below will cause an Activation event to be issued and the
// Project's OnActivation() handler will take care of setting the focus.
w->SetFocus();
#endif
#if defined(__WXMAC__)
// Yes, I know...why 2 SetFocus() calls? Without the second one, focus
// gets lost on wxMac-2.8.12.
w->SetFocus();
#endif
// And make sure it's on top (only for floating windows...project window will not raise)
// (Really only works on Windows)
w->Raise();
}
@ -2831,27 +2813,14 @@ void AudacityProject::PrevWindow()
}
}
// Ran out of siblings, so make the current project's track panel active
// Ran out of siblings, so make the current project active
if (!iter)
{
#if defined(__WXGTK__)
// In wxGTK-2.8.12, focus gets lost if you don't set it to the project window
// instead of the track panel. No idea why.
w = this;
#else
w = mTrackPanel;
#endif
}
// Move focus to the window and bring it to the fore
w->SetFocus();
#if defined(__WXMAC__)
// Yes, I know...why 2 SetFocus() calls? Without the second one, focus
// gets lost on wxMac-2.8.12.
w->SetFocus();
#endif
// And make sure it's on top (only for floating windows...project window will not raise)
// (Really only works on Windows)
w->Raise();
}