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

X11: Fix misreporting DPI factor at startup (#1252)

Browse source 
* X11: Fix misreporting DPI factor at startup

* Add a CHANGELOG entry
This commit is contained in:
Murarth 2019-11-10 13:55:29 -07:00 • committed by Hal Gentz
parent 1ed15c7ec7
commit 9828f368d6
4 changed files with 46 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -382,14 +382,8 @@ impl<T: 'static> EventProcessor<T> {
let (width, height) = shared_state_lock
.dpi_adjusted
.unwrap_or_else(|| (xev.width as f64, xev.height as f64));
let last_hidpi_factor =
shared_state_lock.guessed_dpi.take().unwrap_or_else(|| {
shared_state_lock
.last_monitor
.as_ref()
.map(|last_monitor| last_monitor.hidpi_factor)
.unwrap_or(1.0)
});
let last_hidpi_factor = shared_state_lock.last_monitor.hidpi_factor;
let new_hidpi_factor = {
let window_rect = util::AaRect::new(new_outer_position, new_inner_size);
monitor = wt.xconn.get_monitor_for_window(Some(window_rect));
@ -397,7 +391,7 @@ impl<T: 'static> EventProcessor<T> {
// Avoid caching an invalid dummy monitor handle
if monitor.id != 0 {
shared_state_lock.last_monitor = Some(monitor.clone());
shared_state_lock.last_monitor = monitor.clone();
}
new_hidpi_factor
};