Improve close button and show/hide behavior

main/src/infrastructure/plugin/backbone_shell.rs

@@ -447,7 +447,7 @@ impl BackboneShell {
         }
         // Detect shutdown via hidden child window as suggested by Justin
         let shutdown_detection_panel = SharedView::new(HiddenHelperPanel::new());
-        shutdown_detection_panel.clone().open(reaper_window());
+        shutdown_detection_panel.clone().open(reaper_main_window());
         BackboneShell {
             _tracing_hook: tracing_hook,
             _metrics_hook: metrics_hook,
@@ -1503,7 +1503,11 @@ impl BackboneShell {
 
     pub fn show_welcome_screen() {
         let shell = Self::get();
-        open_child_panel(&shell.welcome_panel, WelcomePanel::new(), reaper_window());
+        open_child_panel(
+            &shell.welcome_panel,
+            WelcomePanel::new(),
+            reaper_main_window(),
+        );
     }
 
     pub fn resolve_symbols_from_clipboard() {
@@ -2796,7 +2800,7 @@ impl ToolbarIconMap for BackboneShell {
     }
 }
 
-fn reaper_window() -> Window {
+pub fn reaper_main_window() -> Window {
     Window::from_hwnd(Reaper::get().main_window())
 }
 

main/src/infrastructure/plugin/instance_shell.rs

@@ -207,6 +207,10 @@ impl InstanceShell {
         self.find_unit_prop_by_id_simple(id, |i, unit_shell| (i, unit_shell.model().clone()))
     }
 
+    pub fn panel(&self) -> &SharedView<InstancePanel> {
+        self.panel.get()
+    }
+
     pub fn find_unit_panel_by_id(&self, id: Option<UnitId>) -> Option<SharedView<UnitPanel>> {
         self.find_unit_prop_by_id_simple(id, |_, unit_shell| unit_shell.panel().clone())
     }

main/src/infrastructure/proto/request_handler.rs

@@ -4,6 +4,7 @@ use reaper_high::{OrCurrentProject, Reaper};
 use tonic::{Response, Status};
 
 use base::spawn_in_main_thread;
+use swell_ui::Window;
 
 use crate::domain::{CompartmentKind, UnitId};
 use crate::infrastructure::api::convert::from_data;
@@ -286,7 +287,9 @@ impl ProtoRequestHandler {
         let action = TriggerGlobalAction::try_from(req.action)
             .map_err(|_| Status::invalid_argument("unknown trigger global action"))?;
         match action {
-            TriggerGlobalAction::Placeholder => {}
+            TriggerGlobalAction::FocusHost => {
+                Window::from_hwnd(Reaper::get().main_window()).focus();
+            }
         }
         Ok(Response::new(Empty {}))
     }
@@ -315,6 +318,9 @@ impl ProtoRequestHandler {
                         .containing_fx()
                         .show_in_floating_window();
                 }
+                TriggerInstanceAction::CloseApp => {
+                    instance.panel().stop_app_instance();
+                }
                 TriggerInstanceAction::ArrangementTogglePlayStop => {
                     if project.is_playing() {
                         project.stop();

main/src/infrastructure/ui/app/app_library.rs

@@ -1,4 +1,4 @@
-use crate::infrastructure::plugin::BackboneShell;
+use crate::infrastructure::plugin::{reaper_main_window, BackboneShell};
 use crate::infrastructure::proto;
 use crate::infrastructure::proto::{
     create_initial_global_updates, create_initial_instance_updates, create_initial_unit_updates,
@@ -174,7 +174,7 @@ impl AppLibrary {
                 .main_library
                 .get(b"hide_app_instance\0")
                 .map_err(|_| anyhow!("failed to load hide_app_instance function"))?;
-            hide_app_instance(app_handle);
+            hide_app_instance(app_handle, reaper_main_window().raw());
         };
         Ok(())
     }
@@ -309,7 +309,7 @@ type StartAppInstance = unsafe extern "C" fn(
 type ShowAppInstance = unsafe extern "C" fn(parent_window: HWND, app_handle: AppHandle);
 
 /// Signature of the function that we use to hide an app instance.
-type HideAppInstance = unsafe extern "C" fn(app_handle: AppHandle);
+type HideAppInstance = unsafe extern "C" fn(app_handle: AppHandle, host_window: HWND);
 
 /// Signature of the function that we use to check whether an app instance has focus.
 type AppInstanceHasFocus = unsafe extern "C" fn(app_handle: AppHandle) -> bool;

main/src/infrastructure/ui/independent_panel_manager.rs

@@ -8,6 +8,7 @@ use crate::domain::{
     CompartmentKind, MappingId, MappingMatchedEvent, SourceFeedbackEvent, TargetControlEvent,
     TargetValueChangedEvent,
 };
+use crate::infrastructure::plugin::reaper_main_window;
 use swell_ui::{SharedView, View, WeakView, Window};
 
 const MAX_PANEL_COUNT: u32 = 4;
@@ -191,7 +192,3 @@ impl Drop for IndependentPanelManager {
         self.destroy();
     }
 }
-
-fn reaper_main_window() -> Window {
-    Window::from_hwnd(Reaper::get().main_window())
-}

main/src/infrastructure/ui/instance_panel.rs

@@ -8,7 +8,7 @@ use std::sync;
 use std::sync::Arc;
 
 use crate::domain::{InstanceId, SharedInstance, UnitId};
-use crate::infrastructure::plugin::{InstanceShell, SharedInstanceShell};
+use crate::infrastructure::plugin::{reaper_main_window, InstanceShell, SharedInstanceShell};
 use crate::infrastructure::ui::bindings::root;
 use crate::infrastructure::ui::util::colors;
 use swell_ui::{DeviceContext, Dimensions, Pixels, SharedView, View, ViewContext, Window};
@@ -310,7 +310,3 @@ impl View for InstancePanel {
         util::view::get_brush_for_color_pair(colors::instance_panel_background())
     }
 }
-
-fn reaper_main_window() -> Window {
-    Window::from_hwnd(Reaper::get().main_window())
-}