-
-
Notifications
You must be signed in to change notification settings - Fork 255
feat(macos): add ExitRequested event #1003
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.
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
luoffei
wants to merge
3
commits into
tauri-apps:dev
Choose a base branch
from
luoffei:feat/dock_exit_requested_event
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "tao": minor | ||
| --- | ||
|
|
||
| Added `event::ExitRequested` handle for dock icon exit on macOS. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // Copyright 2014-2021 The winit contributors | ||
| // Copyright 2021-2023 Tauri Programme within The Commons Conservancy | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| use tao::{ | ||
| event::{Event, WindowEvent}, | ||
| event_loop::{ControlFlow, EventLoop}, | ||
| window::Window, | ||
| }; | ||
|
|
||
| #[allow(clippy::single_match)] | ||
| fn main() { | ||
| let event_loop = EventLoop::new(); | ||
|
|
||
| let mut window = Some(Window::new(&event_loop).unwrap()); | ||
|
|
||
| event_loop.run(move |event, event_loop, control_flow| { | ||
| *control_flow = ControlFlow::Wait; | ||
|
|
||
| match event { | ||
| Event::WindowEvent { | ||
| event: WindowEvent::CloseRequested, | ||
| .. | ||
| } => { | ||
| // drop the window | ||
| window = None; | ||
| } | ||
| Event::MainEventsCleared => { | ||
| if let Some(w) = &window { | ||
| w.request_redraw(); | ||
| } | ||
| } | ||
| Event::ExitRequested => { | ||
| println!("Exit requested"); | ||
|
|
||
| // drop the window | ||
| window = None; | ||
| } | ||
| _ => (), | ||
| } | ||
| }); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I understand correctly, this will cause the application to never quit unless the event loop is changed programatically.
I see that in the associated tauri PR, you call
replyToApplicationShouldTerminatewhich is fine I guess but the default behavior here should returnNS_TERMINATE_NOWand need a way for that to be overridden.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't think of a good way to handle this problem.
Is it possible to transplant the processing method in tauri to tao? By default,
NSTerminateLateris returned. If the user does not handle the event, reply to exit. Otherwise, reply, terminate or cancel according to the user's processing.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there is a similar mechanism used when ScaleFactorChanged event is fired.