migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-30 13:20:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename ControlFlow variant from Complete to Break

Browse Source
This commit is contained in:
mitchmindtree
2017-06-20 21:25:53 +10:00
parent df1276d72a
commit 04ccad1dbc
13 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/linux/wayland/event_loop.rs
View File

@@ -226,8 +226,8 @@ impl EventsLoop {
// Check for control flow by wrapping the callback.
let control_flow = ::std::cell::Cell::new(ControlFlow::Continue);
let callback = |event| if let ControlFlow::Complete = callback(event) {
control_flow.set(ControlFlow::Complete);
let callback = |event| if let ControlFlow::Break = callback(event) {
control_flow.set(ControlFlow::Break);
};
// set the callback into the sink
@@ -251,7 +251,7 @@ impl EventsLoop {
self.prune_dead_windows()
}
if let ControlFlow::Complete = control_flow.get() {
if let ControlFlow::Break = control_flow.get() {
break;
}
}

8
src/platform/linux/x11/mod.rs
View File

@@ -163,18 +163,18 @@ impl EventsLoop {
let mut control_flow = ControlFlow::Continue;
// Track whether or not `Complete` was returned when processing the event.
// Track whether or not `Break` was returned when processing the event.
{
let mut cb = |event| {
if let ControlFlow::Complete = callback(event) {
control_flow = ControlFlow::Complete;
if let ControlFlow::Break = callback(event) {
control_flow = ControlFlow::Break;
}
};
self.process_event(&mut xev, &mut cb);
}
if let ControlFlow::Complete = control_flow {
if let ControlFlow::Break = control_flow {
break;
}
}

8
src/platform/macos/events_loop.rs
View File

@@ -222,8 +222,8 @@ impl EventsLoop {
let control_flow = std::cell::Cell::new(ControlFlow::Continue);
let mut callback = |event| {
if let ControlFlow::Complete = callback(event) {
control_flow.set(ControlFlow::Complete);
if let ControlFlow::Break = callback(event) {
control_flow.set(ControlFlow::Break);
}
};
@@ -233,7 +233,7 @@ impl EventsLoop {
unsafe {
// First, yield all pending events.
self.shared.call_user_callback_with_pending_events();
if let ControlFlow::Complete = control_flow.get() {
if let ControlFlow::Break = control_flow.get() {
break;
}
@@ -254,7 +254,7 @@ impl EventsLoop {
if let Some(event) = maybe_event {
self.shared.user_callback.call_with_event(event);
if let ControlFlow::Complete = control_flow.get() {
if let ControlFlow::Break = control_flow.get() {
break;
}
}