6168 pitch-and-speed focus fixes

crsib · Mar 26, 2024 · 2315371 · 2315371
1 parent 7baedbd
commit 2315371
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/src/tracks/playabletrack/wavetrack/ui/ClipOverflowButtonHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/ClipOverflowButtonHandle.cpp
@@ -10,7 +10,6 @@
 **********************************************************************/
 #include "ClipOverflowButtonHandle.h"
 #include "AllThemeResources.h"
-#include "ClipParameters.h"
 #include "HitTestResult.h"
 #include "LowlitClipButton.h"
 #include "ProjectHistory.h"

diff --git a/src/tracks/playabletrack/wavetrack/ui/ClipPitchAndSpeedButtonHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/ClipPitchAndSpeedButtonHandle.cpp
@@ -151,8 +151,7 @@ UIHandle::Result ClipPitchAndSpeedButtonHandle::DoRelease(
          if (auto pProject = project.lock())
             PitchAndSpeedDialog::Get(*pProject)
                .Retarget(track, clip)
-               .SetFocus(focusedGroup)
-               .Show();
+               .SetFocus(focusedGroup);
       });
    }
    return RefreshCode::RefreshNone;

diff --git a/src/tracks/playabletrack/wavetrack/ui/PitchAndSpeedDialog.cpp b/src/tracks/playabletrack/wavetrack/ui/PitchAndSpeedDialog.cpp
@@ -163,7 +163,7 @@ void PitchAndSpeedDialog::Destroy(AudacityProject& project)
 
 PitchAndSpeedDialog::PitchAndSpeedDialog(AudacityProject& project)
     : wxDialogWrapper(
-         nullptr, wxID_ANY, XO("Pitch and Speed"), wxDefaultPosition,
+         FindProjectFrame(&project), wxID_ANY, XO("Pitch and Speed"), wxDefaultPosition,
          { 480, 250 }, wxDEFAULT_DIALOG_STYLE)
     , mProject { project }
     , mProjectCloseSubscription { ProjectWindow::Get(mProject).Subscribe(
@@ -276,16 +276,12 @@ PitchAndSpeedDialog& PitchAndSpeedDialog::SetFocus(
          nullptr;
    if (item)
       item->SetFocus();
+   wxDialog::Show(true);
+   wxDialog::Raise();
    wxDialog::SetFocus();
    return *this;
 }
 
-PitchAndSpeedDialog& PitchAndSpeedDialog::Show()
-{
-   Show(true);
-   return *this;
-}
-
 void PitchAndSpeedDialog::PopulateOrExchange(ShuttleGui& s)
 {
    {

diff --git a/src/tracks/playabletrack/wavetrack/ui/PitchAndSpeedDialog.h b/src/tracks/playabletrack/wavetrack/ui/PitchAndSpeedDialog.h
@@ -42,7 +42,6 @@ class PitchAndSpeedDialog final :
       const WaveTrack::IntervalHolder& wideClip);
    PitchAndSpeedDialog&
    SetFocus(const std::optional<PitchAndSpeedDialogGroup>& group);
-   PitchAndSpeedDialog& Show();
    void TryRetarget(const TrackPanelMouseEvent& event);
 
    struct PitchShift

diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackAffordanceControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackAffordanceControls.cpp
@@ -658,10 +658,7 @@ void WaveTrackAffordanceControls::StartEditSelectedClipSpeed(
    if (!interval)
       return;
 
-   PitchAndSpeedDialog::Get(project)
-      .Retarget(track, interval)
-      .Show()
-      .SetFocus({});
+   PitchAndSpeedDialog::Get(project).Retarget(track, interval).SetFocus({});
 }
 
 void WaveTrackAffordanceControls::OnRenderClipStretching(