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

Remove Option from HiDpiFactorChanged in favor of a bare PhysicalSize (#1346)

Browse source 
* Remove Option from HiDpiFactorChanged in favor of a bare PhysicalSize

* Fix macos and ios builds
This commit is contained in:
Osspial 2020-01-03 00:28:41 -05:00
parent 777d9edeaa
commit 55166da437
6 changed files with 40 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/platform_impl/linux/wayland/event_loop.rs
View file

@ -730,7 +730,7 @@ impl<T> EventLoop<T> {
if let Some(dpi) = window.new_dpi {
let dpi = dpi as f64;
let logical_size = LogicalSize::<f64>::from(*window.size);
let mut new_inner_size = Some(logical_size.to_physical(dpi));
let mut new_inner_size = logical_size.to_physical(dpi);
callback(Event::WindowEvent {
window_id,
@ -740,11 +740,9 @@ impl<T> EventLoop<T> {
},
});
if let Some(new_size) = new_inner_size {
let (w, h) = new_size.to_logical::<u32>(dpi).into();
frame.resize(w, h);
*window.size = (w, h);
}
let (w, h) = new_inner_size.to_logical::<u32>(dpi).into();
frame.resize(w, h);
*window.size = (w, h);
}
}
if window.closed {

23
src/platform_impl/linux/x11/event_processor.rs
View file

@ -422,7 +422,8 @@ impl<T: 'static> EventProcessor<T> {
height,
);
let mut new_inner_size = Some(PhysicalSize::new(new_width, new_height));
let old_inner_size = PhysicalSize::new(width, height);
let mut new_inner_size = PhysicalSize::new(new_width, new_height);
callback(Event::WindowEvent {
window_id,
@ -432,9 +433,12 @@ impl<T: 'static> EventProcessor<T> {
},
});
if let Some(new_size) = new_inner_size {
window.set_inner_size_physical(new_size.width, new_size.height);
shared_state_lock.dpi_adjusted = Some(new_size.into());
if new_inner_size != old_inner_size {
window.set_inner_size_physical(
new_inner_size.width,
new_inner_size.height,
);
shared_state_lock.dpi_adjusted = Some(new_inner_size.into());
// if the DPI factor changed, force a resize event to ensure the logical
// size is computed with the right DPI factor
resized = true;
@ -1135,9 +1139,10 @@ impl<T: 'static> EventProcessor<T> {
*window_id,
),
);
let mut new_inner_size = Some(
PhysicalSize::new(new_width, new_height),
);
let old_inner_size =
PhysicalSize::new(width, height);
let mut new_inner_size =
PhysicalSize::new(new_width, new_height);
callback(Event::WindowEvent {
window_id,
@ -1147,9 +1152,9 @@ impl<T: 'static> EventProcessor<T> {
},
});
if let Some(new_size) = new_inner_size {
if new_inner_size != old_inner_size {
let (new_width, new_height) =
new_size.into();
new_inner_size.into();
window.set_inner_size_physical(
new_width, new_height,
);