migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 07:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove internal ActiveEventLoop::clear_exit

Browse Source 
How to store and clear the internal state should be internal to the
implementation on each backend.
This commit is contained in:
Mads Marquart
2024-07-14 20:51:38 +02:00
committed by GitHub
parent 5b8f5cb54a
commit ee3ab33a7c
7 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/platform_impl/android/mod.rs
View File

@@ -425,6 +425,7 @@ impl EventLoop {
&mut self,
mut app: A,
) -> Result<(), EventLoopError> {
self.window_target.p.clear_exit();
loop {
match self.pump_app_events(None, &mut app) {
PumpStatus::Exit(0) => {

5
src/platform_impl/apple/appkit/event_loop.rs
View File

@@ -129,10 +129,6 @@ impl ActiveEventLoop {
self.delegate.exit()
}
pub(crate) fn clear_exit(&self) {
self.delegate.clear_exit()
}
pub(crate) fn exiting(&self) -> bool {
self.delegate.exiting()
}
@@ -255,6 +251,7 @@ impl EventLoop {
&mut self,
mut app: A,
) -> Result<(), EventLoopError> {
self.delegate.clear_exit();
self.delegate.set_event_handler(&mut app, || {
autoreleasepool(|_| {
// clear / normalize pump_events state

4
src/platform_impl/linux/mod.rs
View File

@@ -904,7 +904,7 @@ impl ActiveEventLoop {
x11_or_wayland!(match self; Self(evlp) => evlp.control_flow())
}
pub(crate) fn clear_exit(&self) {
fn clear_exit(&self) {
x11_or_wayland!(match self; Self(evlp) => evlp.clear_exit())
}
@@ -925,12 +925,10 @@ impl ActiveEventLoop {
}
}
#[allow(dead_code)]
fn set_exit_code(&self, code: i32) {
x11_or_wayland!(match self; Self(evlp) => evlp.set_exit_code(code))
}
#[allow(dead_code)]
fn exit_code(&self) -> Option<i32> {
x11_or_wayland!(match self; Self(evlp) => evlp.exit_code())
}

1
src/platform_impl/linux/wayland/event_loop/mod.rs
View File

@@ -168,6 +168,7 @@ impl EventLoop {
&mut self,
mut app: A,
) -> Result<(), EventLoopError> {
self.window_target.p.clear_exit();
let exit = loop {
match self.pump_app_events(None, &mut app) {
PumpStatus::Exit(0) => {

7
src/platform_impl/linux/x11/mod.rs
View File

@@ -375,6 +375,7 @@ impl EventLoop {
&mut self,
mut app: A,
) -> Result<(), EventLoopError> {
self.event_processor.target.p.clear_exit();
let exit = loop {
match self.pump_app_events(None, &mut app) {
PumpStatus::Exit(0) => {
@@ -600,13 +601,11 @@ impl EventLoop {
}
fn set_exit_code(&self, code: i32) {
let window_target = EventProcessor::window_target(&self.event_processor.target);
window_target.set_exit_code(code);
self.window_target().p.set_exit_code(code);
}
fn exit_code(&self) -> Option<i32> {
let window_target = EventProcessor::window_target(&self.event_processor.target);
window_target.exit_code()
self.window_target().p.exit_code()
}
}

1
src/platform_impl/windows/event_loop.rs
View File

@@ -195,6 +195,7 @@ impl EventLoop {
&mut self,
mut app: A,
) -> Result<(), EventLoopError> {
self.window_target.p.clear_exit();
{
let runner = &self.window_target.p.runner_shared;