leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert #466 'Discard mouse down after Cocoa window resize' (#470)

Browse source 
This reverts commit 19cd53193b.

Testing fullscreen functionality revealed that windowDidResize is invoked in more cases than previously thought, causing the user's events to be eaten and HiDPI problems.
This commit is contained in:
Francesca Frangipane 2018-04-17 20:48:57 -04:00 • committed by GitHub
parent 0474dc9861
commit eae7cb247c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/platform/macos/events_loop.rs
View file

@ -6,7 +6,6 @@ use std::collections::VecDeque;
use std::sync::{Arc, Mutex, Weak};
use super::window::Window2;
use std;
use std::cell::RefCell;
use super::DeviceId;
@ -19,7 +18,6 @@ pub struct EventsLoop {
pub struct Shared {
pub windows: Mutex<Vec<Weak<Window2>>>,
pub pending_events: Mutex<VecDeque<Event>>,
pub discard_event: RefCell<bool>,
// The user event callback given via either of the `poll_events` or `run_forever` methods.
//
// We store the user's callback here so that it may be accessed by each of the window delegate
@ -57,7 +55,6 @@ impl Shared {
Shared {
windows: Mutex::new(Vec::new()),
pending_events: Mutex::new(VecDeque::new()),
discard_event: RefCell::new(false),
user_callback: UserCallback { mutex: Mutex::new(None) },
}
}
@ -102,19 +99,6 @@ impl Shared {
}
}
// Instructs the `EventsLoop` to discard the next input event.
//
// This is called when the window is resized, to avoid a delayed mouse down event being posted
// after the resize completes.
pub fn discard_next_event(&self) {
*self.discard_event.borrow_mut() = true;
}
fn should_discard_next_event(&self) -> bool {
let result = *self.discard_event.borrow();
*self.discard_event.borrow_mut() = false;
result
}
}
@ -224,11 +208,7 @@ impl EventsLoop {
match event {
// Call the user's callback.
Some(event) => {
if !self.shared.should_discard_next_event() {
self.shared.user_callback.call_with_event(event);
}
},
Some(event) => self.shared.user_callback.call_with_event(event),
None => break,
}
}
@ -281,9 +261,7 @@ impl EventsLoop {
let _: () = msg_send![pool, release];
if let Some(event) = maybe_event {
if !self.shared.should_discard_next_event() {
self.shared.user_callback.call_with_event(event);
}
self.shared.user_callback.call_with_event(event);
if let ControlFlow::Break = control_flow.get() {
break;
}

5
src/platform/macos/window.rs
View file

@ -181,11 +181,6 @@ impl WindowDelegate {
let state: *mut c_void = *this.get_ivar("winitState");
let state = &mut *(state as *mut DelegateState);
emit_resize_event(state);
// discard the pending mouse down event
if let Some(shared) = state.shared.upgrade() {
shared.discard_next_event();
}
}
}