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

Simplify event queuing on macOS (#2642)

Browse source
This commit is contained in:
Mads Marquart 2023-01-22 23:29:38 +01:00 • committed by GitHub
parent 7341ee80ea
commit 0f2fbe373b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 143 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/platform_impl/macos/window_delegate.rs
View file

@ -65,7 +65,7 @@ declare_class!(
Ivar::write(&mut this.previous_scale_factor, scale_factor);
if scale_factor != 1.0 {
this.emit_static_scale_factor_changed_event();
this.queue_static_scale_factor_changed_event();
}
this.window.setDelegate(Some(this));
@ -94,7 +94,7 @@ declare_class!(
#[sel(windowShouldClose:)]
fn window_should_close(&self, _: Option<&Object>) -> bool {
trace_scope!("windowShouldClose:");
self.emit_event(WindowEvent::CloseRequested);
self.queue_event(WindowEvent::CloseRequested);
false
}
@ -107,7 +107,7 @@ declare_class!(
// be called after the window closes.
self.window.setDelegate(None);
});
self.emit_event(WindowEvent::Destroyed);
self.queue_event(WindowEvent::Destroyed);
}
#[sel(windowDidResize:)]
@ -127,7 +127,7 @@ declare_class!(
#[sel(windowDidChangeBackingProperties:)]
fn window_did_change_backing_properties(&mut self, _: Option<&Object>) {
trace_scope!("windowDidChangeBackingProperties:");
self.emit_static_scale_factor_changed_event();
self.queue_static_scale_factor_changed_event();
}
#[sel(windowDidBecomeKey:)]
@ -135,7 +135,7 @@ declare_class!(
trace_scope!("windowDidBecomeKey:");
// TODO: center the cursor if the window had mouse grab when it
// lost focus
self.emit_event(WindowEvent::Focused(true));
self.queue_event(WindowEvent::Focused(true));
}
#[sel(windowDidResignKey:)]
@ -155,10 +155,10 @@ declare_class!(
// Both update the state and emit a ModifiersChanged event.
if !view.state.modifiers.is_empty() {
view.state.modifiers = ModifiersState::empty();
self.emit_event(WindowEvent::ModifiersChanged(view.state.modifiers));
self.queue_event(WindowEvent::ModifiersChanged(view.state.modifiers));
}
self.emit_event(WindowEvent::Focused(false));
self.queue_event(WindowEvent::Focused(false));
}
/// Invoked when the dragged image enters destination bounds or frame
@ -174,7 +174,7 @@ declare_class!(
filenames.into_iter().for_each(|file| {
let path = PathBuf::from(file.to_string());
self.emit_event(WindowEvent::HoveredFile(path));
self.queue_event(WindowEvent::HoveredFile(path));
});
true
@ -200,7 +200,7 @@ declare_class!(
filenames.into_iter().for_each(|file| {
let path = PathBuf::from(file.to_string());
self.emit_event(WindowEvent::DroppedFile(path));
self.queue_event(WindowEvent::DroppedFile(path));
});
true
@ -216,7 +216,7 @@ declare_class!(
#[sel(draggingExited:)]
fn dragging_exited(&self, _: Option<&Object>) {
trace_scope!("draggingExited:");
self.emit_event(WindowEvent::HoveredFileCancelled);
self.queue_event(WindowEvent::HoveredFileCancelled);
}
/// Invoked when before enter fullscreen
@ -357,7 +357,7 @@ declare_class!(
#[sel(windowDidChangeOcclusionState:)]
fn window_did_change_occlusion_state(&self, _: Option<&Object>) {
trace_scope!("windowDidChangeOcclusionState:");
self.emit_event(WindowEvent::Occluded(
self.queue_event(WindowEvent::Occluded(
!self
.window
.occlusionState()
@ -389,7 +389,7 @@ declare_class!(
shared_state.current_theme = Some(theme);
drop(shared_state);
if current_theme != Some(theme) {
self.emit_event(WindowEvent::ThemeChanged(theme));
self.queue_event(WindowEvent::ThemeChanged(theme));
}
}
}
@ -406,7 +406,7 @@ impl WinitWindowDelegate {
}
}
fn emit_event(&self, event: WindowEvent<'static>) {
fn queue_event(&self, event: WindowEvent<'static>) {
let event = Event::WindowEvent {
window_id: WindowId(self.window.id()),
event,
@ -414,7 +414,7 @@ impl WinitWindowDelegate {
AppState::queue_event(EventWrapper::StaticEvent(event));
}
fn emit_static_scale_factor_changed_event(&mut self) {
fn queue_static_scale_factor_changed_event(&mut self) {
let scale_factor = self.window.scale_factor();
if scale_factor == *self.previous_scale_factor {
return;
@ -437,7 +437,7 @@ impl WinitWindowDelegate {
*self.previous_position = Some(Box::new((x, y)));
let scale_factor = self.window.scale_factor();
let physical_pos = LogicalPosition::<f64>::from((x, y)).to_physical(scale_factor);
self.emit_event(WindowEvent::Moved(physical_pos));
self.queue_event(WindowEvent::Moved(physical_pos));
}
}