Skip to content

fix: add tray Quit for Windows/MacOS and exit-on-close for Linux #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZS041 wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Open

fix: add tray Quit for Windows/MacOS and exit-on-close for Linux #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions ui/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,18 @@ fn main() {
.with_has_shadow(true)
.with_fullsize_content_view(true);

// On Linux, close-button exits the app: GTK windows have no auto-generated
// menu bar (unlike macOS/Windows) and default GNOME does not render
// libappindicator tray icons w/o an extension, leaving users with no reachable quit
// w/ the window hidden. On macOS/Windows, close hides so
// the tray icon (and Cmd+Q / Window menu) can restore
#[cfg(target_os = "linux")]
let close_behaviour = WindowCloseBehaviour::WindowCloses;
#[cfg(not(target_os = "linux"))]
let close_behaviour = WindowCloseBehaviour::WindowHides;

let mut config = Config::new()
// Make "close" behave like hide, so the tray icon can restore it.
.with_close_behaviour(WindowCloseBehaviour::WindowHides)
.with_close_behaviour(close_behaviour)
.with_window(window_builder);

dioxus::LaunchBuilder::desktop()
Expand Down Expand Up @@ -510,6 +519,9 @@ fn App() -> Element {
"hide" => {
window.set_visible(false);
}
"quit" => {
std::process::exit(0);
}
"new_tunnel" => {
if login_state_for_tray() == Some(lib::datum_cloud::LoginState::Missing)
|| login_state_for_tray().is_none()
Expand Down Expand Up @@ -780,6 +792,7 @@ fn init_tray() -> TrayIcon {
let about_item = MenuItem::with_id("about", "About Datum", true, None);
let show_item = MenuItem::with_id("show", "Show Window", true, None);
let hide_item = MenuItem::with_id("hide", "Hide", true, None);
let quit_item = MenuItem::with_id("quit", "Quit Datum", true, None);

#[cfg(target_os = "macos")]
let new_tunnel_item = IconMenuItem::with_id_and_native_icon(
Expand Down Expand Up @@ -808,6 +821,8 @@ fn init_tray() -> TrayIcon {
&show_item,
&hide_item,
&sep,
&quit_item,
&sep,
&version_item,
])
.expect("Failed to build tray menu");
Expand Down
Loading