first pass of merging in warp (doesn't build)
This commit is contained in:
@@ -1,14 +1,11 @@
|
||||
use std::mem::ManuallyDrop;
|
||||
use std::sync::mpsc::{Receiver, Sender};
|
||||
|
||||
use crate::{
|
||||
platform::{
|
||||
self,
|
||||
app::{AppCallbackDispatcher, ApproveTerminateResult, TerminationResult},
|
||||
TerminationMode,
|
||||
},
|
||||
AppContext, WindowId,
|
||||
use crate::platform::app::{
|
||||
AppCallbackDispatcher, ApproveTerminateResult, TerminationRequestSource, TerminationResult,
|
||||
};
|
||||
use crate::platform::{self, TerminationMode};
|
||||
use crate::{AppContext, WindowId};
|
||||
|
||||
/// Application events handled on the headless platform's main thread.
|
||||
pub(super) enum AppEvent {
|
||||
@@ -51,7 +48,7 @@ pub(super) fn run(
|
||||
let should_terminate = match termination_mode {
|
||||
TerminationMode::Cancellable => {
|
||||
matches!(
|
||||
callbacks.should_terminate_app(),
|
||||
callbacks.should_terminate_app(TerminationRequestSource::User),
|
||||
ApproveTerminateResult::Terminate
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user