Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 74 additions & 8 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ serde_json = "1.0"
semver = "1.0"
shlex = "1.3"
tauri = { version = "2.0", features = ["tray-icon"] }
tauri-plugin-autostart = "2.0"
tauri-plugin-process = "2.0"
tauri-plugin-single-instance = "2.0"
tauri-plugin-updater = "2.0"
Expand Down
33 changes: 31 additions & 2 deletions src-tauri/src/app_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@ use tauri::{
};

use crate::{
app_runtime_events, append_desktop_log, append_startup_log, bridge, lifecycle, startup_task,
tray, window, BackendState, DEFAULT_SHELL_LOCALE, DESKTOP_LOG_FILE, STARTUP_MODE_ENV,
app_runtime_events, append_desktop_log, append_startup_log, bridge, desktop_settings,
lifecycle, runtime_paths, startup_task, tray, window, BackendState, DesktopSettingsCache,
DEFAULT_SHELL_LOCALE, DESKTOP_LOG_FILE, STARTUP_MODE_ENV,
};

fn configure_plugins(builder: Builder<tauri::Wry>) -> Builder<tauri::Wry> {
builder
.plugin(tauri_plugin_autostart::init(
tauri_plugin_autostart::MacosLauncher::LaunchAgent,
None,
))
.plugin(tauri_plugin_process::init())
.plugin(tauri_plugin_updater::Builder::new().build())
.plugin(tauri_plugin_single_instance::init(|app, _argv, _cwd| {
Expand All @@ -21,20 +26,23 @@ fn configure_plugins(builder: Builder<tauri::Wry>) -> Builder<tauri::Wry> {
fn configure_window_events(builder: Builder<tauri::Wry>) -> Builder<tauri::Wry> {
builder.on_window_event(|window, event| {
let is_quitting = window.app_handle().state::<BackendState>().is_quitting();
let desktop_settings = window.app_handle().state::<DesktopSettingsCache>().get();
let action = match &event {
WindowEvent::CloseRequested { .. } => app_runtime_events::main_window_action(
window.label(),
is_quitting,
false,
true,
false,
desktop_settings.close_to_tray,
),
WindowEvent::Focused(false) => app_runtime_events::main_window_action(
window.label(),
is_quitting,
matches!(window.is_minimized(), Ok(true)),
false,
true,
desktop_settings.close_to_tray,
),
_ => app_runtime_events::MainWindowAction::None,
};
Expand All @@ -50,6 +58,12 @@ fn configure_window_events(builder: Builder<tauri::Wry>) -> Builder<tauri::Wry>
append_desktop_log,
);
}
app_runtime_events::MainWindowAction::PreventCloseAndExit => {
if let WindowEvent::CloseRequested { api, .. } = event {
api.prevent_close();
}
lifecycle::events::handle_tray_quit(window.app_handle());
}
app_runtime_events::MainWindowAction::HideIfMinimized => {
window::actions::hide_main_window(
window.app_handle(),
Expand Down Expand Up @@ -119,6 +133,16 @@ fn configure_setup(builder: Builder<tauri::Wry>) -> Builder<tauri::Wry> {
}
crate::windows_shutdown::install(&app_handle);

let desktop_settings = app_handle.state::<DesktopSettingsCache>().get();
if desktop_settings.silent_launch {
append_startup_log("silent launch enabled, hiding main window");
window::actions::hide_main_window(
&app_handle,
DEFAULT_SHELL_LOCALE,
append_desktop_log,
);
}

startup_task::spawn_startup_task(app_handle.clone(), append_startup_log);
Ok(())
})
Expand Down Expand Up @@ -161,6 +185,11 @@ pub(crate) fn run() {

builder
.manage(BackendState::default())
.manage(DesktopSettingsCache::new(
desktop_settings::read_desktop_settings(
runtime_paths::default_packaged_root_dir().as_deref(),
),
))
.invoke_handler(tauri::generate_handler![
crate::bridge::commands::desktop_bridge_is_desktop_runtime,
crate::bridge::commands::desktop_bridge_get_backend_state,
Expand Down
20 changes: 16 additions & 4 deletions src-tauri/src/app_runtime_events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use tauri::{webview::PageLoadEvent, RunEvent};
pub(crate) enum MainWindowAction {
None,
PreventCloseAndHide,
PreventCloseAndExit,
HideIfMinimized,
}

Expand All @@ -29,6 +30,7 @@ pub(crate) fn main_window_action(
minimized_on_focus_lost: bool,
is_close_requested: bool,
is_focus_lost: bool,
close_to_tray: bool,
) -> MainWindowAction {
if window_label != "main" {
return MainWindowAction::None;
Expand All @@ -37,8 +39,10 @@ pub(crate) fn main_window_action(
if is_close_requested {
return if is_quitting {
MainWindowAction::None
} else {
} else if close_to_tray {
MainWindowAction::PreventCloseAndHide
} else {
MainWindowAction::PreventCloseAndExit
};
}

Expand Down Expand Up @@ -101,23 +105,31 @@ mod tests {
#[test]
fn main_window_action_ignores_non_main_windows() {
assert_eq!(
main_window_action("settings", false, false, true, false),
main_window_action("settings", false, false, true, false, true),
MainWindowAction::None
);
}

#[test]
fn main_window_action_hides_on_close_when_not_quitting() {
assert_eq!(
main_window_action("main", false, false, true, false),
main_window_action("main", false, false, true, false, true),
MainWindowAction::PreventCloseAndHide
);
}

#[test]
fn main_window_action_allows_close_when_close_to_tray_is_disabled() {
assert_eq!(
main_window_action("main", false, false, true, false, false),
MainWindowAction::PreventCloseAndExit
);
}

#[test]
fn main_window_action_hides_on_minimized_focus_loss() {
assert_eq!(
main_window_action("main", false, true, false, true),
main_window_action("main", false, true, false, true, true),
MainWindowAction::HideIfMinimized
);
}
Expand Down
5 changes: 4 additions & 1 deletion src-tauri/src/app_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::{
Arc, Mutex,
},
};
use tauri::menu::MenuItem;
use tauri::menu::{CheckMenuItem, MenuItem};

use crate::{backend, exit_state, DEFAULT_BACKEND_URL};

Expand All @@ -17,6 +17,9 @@ pub(crate) struct TrayMenuState {
pub(crate) toggle_item: MenuItem<tauri::Wry>,
pub(crate) reload_item: MenuItem<tauri::Wry>,
pub(crate) restart_backend_item: MenuItem<tauri::Wry>,
pub(crate) launch_at_login_item: CheckMenuItem<tauri::Wry>,
pub(crate) silent_launch_item: CheckMenuItem<tauri::Wry>,
pub(crate) close_to_tray_item: CheckMenuItem<tauri::Wry>,
pub(crate) quit_item: MenuItem<tauri::Wry>,
}

Expand Down
Loading