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

On macOS, send a Resized event after ScaleFactorChanged

Browse Source 
Fixes #3213.
This commit is contained in:
Nathan Lilienthal
2023-11-06 17:26:02 -05:00
committed by GitHub
parent e9210555c1
commit c89e6df758
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -13,6 +13,7 @@ Unreleased` header.
- On X11, check common alternative cursor names when loading cursor. - On X11, check common alternative cursor names when loading cursor.
- On Windows, fix so `drag_window` and `drag_resize_window` can be called from another thread. - On Windows, fix so `drag_window` and `drag_resize_window` can be called from another thread.
- On macOS, send a `Resized` event after each `ScaleFactorChanged` event.
# 0.29.3 # 0.29.3

10
src/platform_impl/macos/app_state.rs
View File

@@ -329,7 +329,7 @@ impl Handler {
) { ) {
if let Some(ref mut callback) = *self.callback.lock().unwrap() { if let Some(ref mut callback) = *self.callback.lock().unwrap() {
let new_inner_size = Arc::new(Mutex::new(suggested_size)); let new_inner_size = Arc::new(Mutex::new(suggested_size));
let event = Event::WindowEvent { let scale_factor_changed_event = Event::WindowEvent {
window_id: WindowId(window.id()), window_id: WindowId(window.id()),
event: WindowEvent::ScaleFactorChanged { event: WindowEvent::ScaleFactorChanged {
scale_factor, scale_factor,
@@ -337,13 +337,19 @@ impl Handler {
}, },
}; };
callback.handle_nonuser_event(event); callback.handle_nonuser_event(scale_factor_changed_event);
let physical_size = *new_inner_size.lock().unwrap(); let physical_size = *new_inner_size.lock().unwrap();
drop(new_inner_size); drop(new_inner_size);
let logical_size = physical_size.to_logical(scale_factor); let logical_size = physical_size.to_logical(scale_factor);
let size = NSSize::new(logical_size.width, logical_size.height); let size = NSSize::new(logical_size.width, logical_size.height);
window.setContentSize(size); window.setContentSize(size);
let resized_event = Event::WindowEvent {
window_id: WindowId(window.id()),
event: WindowEvent::Resized(physical_size),
};
callback.handle_nonuser_event(resized_event);
} }
} }
} }