eliott/openwork
1
0
Fork 0
mirror of https://github.com/different-ai/openwork synced 2026-04-26 01:25:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix/mac app closing onclose (#1489) (#1490)

Browse Source 
* refactor(app): remove hide_main_window function and update macOS window close behavior

Eliminate the hide_main_window function to streamline window management. Update the macOS behavior to exit the application when the main window is closed, aligning it with the behavior on Windows and Linux.

* surface openwork as main focused window onDock click
This commit is contained in:
Jan Carbonell
2026-04-19 08:02:50 -07:00
committed by GitHub
parent 08603fbbb6
commit ebcca56dda
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/desktop/src-tauri/src/lib.rs
View File

@@ -114,12 +114,6 @@ fn show_main_window(app_handle: &AppHandle) {
}
}
fn hide_main_window(app_handle: &AppHandle) {
if let Some(window) = app_handle.get_webview_window("main") {
let _ = window.hide();
}
}
fn stop_managed_services(app_handle: &tauri::AppHandle) {
if let Ok(mut engine) = app_handle.state::<EngineManager>().inner.lock() {
EngineManager::stop_locked(&mut engine);
@@ -227,14 +221,16 @@ pub fn run() {
// orchestrator/opencode/openwork-server processes and stale ports.
app.run(|app_handle, event| match event {
RunEvent::ExitRequested { .. } | RunEvent::Exit => stop_managed_services(&app_handle),
// On macOS the default behavior is to keep the process alive after the
// last window closes. We want parity with Windows/Linux: closing the
// main window quits the app.
#[cfg(target_os = "macos")]
RunEvent::WindowEvent {
label,
event: WindowEvent::CloseRequested { api, .. },
event: WindowEvent::CloseRequested { .. },
..
} if label == "main" => {
api.prevent_close();
hide_main_window(&app_handle);
app_handle.exit(0);
}
#[cfg(target_os = "macos")]
RunEvent::Opened { urls } => {
@@ -245,14 +241,11 @@ pub fn run() {
show_main_window(&app_handle);
emit_native_deep_links(&app_handle, urls);
}
// Always raise/refocus the main window on dock-icon clicks, even if
// it's already visible but behind other apps or on another Space.
#[cfg(target_os = "macos")]
RunEvent::Reopen {
has_visible_windows,
..
} => {
if !has_visible_windows {
show_main_window(&app_handle);
}
RunEvent::Reopen { .. } => {
show_main_window(&app_handle);
}
_ => {}
});