From 73a05e4bc2c1e5e39025d278f140151567f203be Mon Sep 17 00:00:00 2001
From: Tim <tim@localhost.localdomain>
Date: Thu, 17 Oct 2024 02:01:26 -0400
Subject: [PATCH] Fix 1287: Focus return to arranger window when pianoroll
 closed

---
 src/ChangeLog    | 3 +++
 src/muse/app.cpp | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 13aaf675d..cb9b01de1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,6 @@
+17.10.2024
+    - Fix issue 1287: Focus doesn't return to arranger window when pianoroll closed. (Tim)
+      In MusE::toplevelDeleting(), call TopWin::focusCanvas() to direct focus to the canvas.
 16.10.2024
     - Event List Editor: Fixed cannot open multiple parts. (Tim)
       Thanks to forum user 'enaiel' for spotting that.
diff --git a/src/muse/app.cpp b/src/muse/app.cpp
index b298892d1..0c4a27108 100644
--- a/src/muse/app.cpp
+++ b/src/muse/app.cpp
@@ -3727,6 +3727,11 @@ void MusE::toplevelDeleting(MusEGui::TopWin* tl)
 
                         bringToFront((*lit)->widget());
 
+                        // If the TopWin has a canvas and a focusCanvas(), call it to focus the canvas.
+                        TopWin* tw = dynamic_cast<TopWin*>( (*lit)->widget());
+                        if(tw)
+                          tw->focusCanvas();
+
                         break;
                     }
             }