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

Bug 2411 - Mac: Crash on docking/undocking Audacity with un-docked toolbar(s)

Browse Source
This commit is contained in:
Leland Lucius 2020-05-02 21:03:23 -05:00
parent ffa4701247
commit 999872c21d
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/ProjectWindow.cpp
View File

@ -1233,6 +1233,38 @@ void ProjectWindow::UpdateStatusWidths()
statusBar->SetStatusWidths( nWidths, widths );
}
void ProjectWindow::MacShowUndockedToolbars(bool show)
{
(void)show;//compiler food
#ifdef __WXMAC__
// Save the focus so we can restore it to whatever had it before since
// showing a previously hidden toolbar will cause the focus to be set to
// its frame. If this is not done it will appear that activation events
// aren't being sent to the project window since they are actually being
// delivered to the last tool frame shown.
wxWindow *focused = FindFocus();
// Find all the floating toolbars, and show or hide them
const auto &children = GetChildren();
for(const auto &child : children) {
if (auto frame = dynamic_cast<ToolFrame*>(child)) {
if (!show) {
frame->Hide();
}
else if (frame->GetBar() &&
frame->GetBar()->IsVisible() ) {
frame->Show();
}
}
}
// Restore the focus if needed
if (focused) {
focused->SetFocus();
}
#endif
}
void ProjectWindow::OnIconize(wxIconizeEvent &event)
{
//JKC: On Iconizing we get called twice. Don't know
@ -1241,6 +1273,16 @@ void ProjectWindow::OnIconize(wxIconizeEvent &event)
// void return? I don't know.
mIconized = event.IsIconized();
#if defined(__WXMAC__)
// Readdresses bug 1431 since a crash could occur when restoring iconized
// floating toolbars due to recursion (bug 2411).
MacShowUndockedToolbars(!mIconized);
if( !mIconized )
{
Raise();
}
#endif
// VisibileProjectCount seems to be just a counter for debugging.
// It's not used outside this function.
auto VisibleProjectCount = std::count_if(
@ -1440,24 +1482,6 @@ void ProjectWindow::OnUpdateUI(wxUpdateUIEvent & WXUNUSED(event))
MenuManager::Get( project ).UpdateMenus();
}
void ProjectWindow::MacShowUndockedToolbars(bool show)
{
(void)show;//compiler food
#ifdef __WXMAC__
// Find all the floating toolbars, and show or hide them
const auto &children = GetChildren();
for(const auto &child : children) {
if (auto frame = dynamic_cast<ToolFrame*>(child)) {
if (!show)
frame->Hide();
else if (frame->GetBar() &&
frame->GetBar()->IsVisible())
frame->Show();
}
}
#endif
}
void ProjectWindow::OnActivate(wxActivateEvent & event)
{
// Activate events can fire during window teardown, so just
@ -1467,7 +1491,7 @@ void ProjectWindow::OnActivate(wxActivateEvent & event)
}
auto &project = mProject;
mActive = event.GetActive();
// Under Windows, focus can be "lost" when returning to
@ -1481,21 +1505,11 @@ void ProjectWindow::OnActivate(wxActivateEvent & event)
// Then, when we receive the
// activate event, we restore that focus to the child or the track
// panel if no child had the focus (which probably should never happen).
if (!mActive) {
#ifdef __WXMAC__
if (IsIconized())
MacShowUndockedToolbars(false);
#endif
}
else {
if (mActive) {
auto &toolManager = ToolManager::Get( project );
SetActiveProject( &project );
if ( ! toolManager.RestoreFocus() )
GetProjectPanel( project ).SetFocus();
#ifdef __WXMAC__
MacShowUndockedToolbars(true);
#endif
}
event.Skip();
}

13
src/TrackPanel.cpp
View File

@ -398,19 +398,6 @@ void TrackPanel::OnIdle(wxIdleEvent& event)
/// AS: This gets called on our wx timer events.
void TrackPanel::OnTimer(wxTimerEvent& )
{
#ifdef __WXMAC__
// Unfortunate part of fix for bug 1431
// Without this, the toolbars hide only every other time that you press
// the yellow title bar button. For some reason, not every press sends
// us a deactivate event for the application.
{
auto project = GetProject();
auto &window = ProjectWindow::Get( *project );
if (window.IsIconized())
window.MacShowUndockedToolbars(false);
}
#endif
mTimeCount++;
AudacityProject *const p = GetProject();