skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Workaround for egui having wrong scale in firefox" (#5481) 

* Reverts emilk/egui#5466

Restores pixel-perfect rendering on chromium, Mac
This commit is contained in:
Emil Ernerfeldt 2024-12-16 14:41:02 +01:00 committed by GitHub
parent f0ec2f05c4
commit 3995491212
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/eframe/src/web/events.rs
View File

@ -870,15 +870,7 @@ fn get_display_size(resize_observer_entries: &js_sys::Array) -> Result<(u32, u32
let mut dpr = web_sys::window().unwrap().device_pixel_ratio(); let mut dpr = web_sys::window().unwrap().device_pixel_ratio();
let entry: web_sys::ResizeObserverEntry = resize_observer_entries.at(0).dyn_into()?; let entry: web_sys::ResizeObserverEntry = resize_observer_entries.at(0).dyn_into()?;
// TODO(lucasmerlin): This is disabled because of https://github.com/emilk/egui/issues/5246 if JsValue::from_str("devicePixelContentBoxSize").js_in(entry.as_ref()) {
// Not only does it break on chrome when moving the window across screens, but it also
// completely breaks in firefox because for some reason firefox reports the devicePixelRatio
// as 2.0 when it should be 1.0.
// The proper fix would probably be to calculate the correct device pixel ratio based on
// the inline_size and the content_rect.width, and use that
// wherever we access window.devicePixelRatio
#[allow(clippy::overly_complex_bool_expr)]
if JsValue::from_str("devicePixelContentBoxSize").js_in(entry.as_ref()) && false {
// NOTE: Only this path gives the correct answer for most browsers. // NOTE: Only this path gives the correct answer for most browsers.
// Unfortunately this doesn't work perfectly everywhere. // Unfortunately this doesn't work perfectly everywhere.
let size: web_sys::ResizeObserverSize = let size: web_sys::ResizeObserverSize =