alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-10-17 07:21:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix Window::set_inner_size()"

Browse source 
This reverts commit e220a75556.
This commit is contained in:
dAxpeDDa 2023-06-08 08:40:26 +02:00 committed by daxpedda
parent 9797ed86f0
commit b5785ba785
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -54,8 +54,7 @@ And please only add new entries to the top of this list, right below the `# Unre
- On Wayland, drop `WINIT_WAYLAND_CSD_THEME` variable. - On Wayland, drop `WINIT_WAYLAND_CSD_THEME` variable.
- Implement `PartialOrd` and `Ord` on types in the `dpi` module. - Implement `PartialOrd` and `Ord` on types in the `dpi` module.
- **Breaking:** Bump MSRV from `1.60` to `1.64`. - **Breaking:** Bump MSRV from `1.60` to `1.64`.
- **Breaking:** On Web, `Window::(set_)inner_size()` will return/change the visual canvas size - **Breaking:** On Web, the canvas output bitmap size is no longer adjusted.
instead of the internal canvas size.
- On Web: fix `Window::request_redraw` not waking the event loop when called from outside the loop. - On Web: fix `Window::request_redraw` not waking the event loop when called from outside the loop.
- On Web: fix position of touch events to be relative to the canvas. - On Web: fix position of touch events to be relative to the canvas.
- On Web, fix `Window:::set_fullscreen` doing nothing when called outside the event loop but during - On Web, fix `Window:::set_fullscreen` doing nothing when called outside the event loop but during

14
src/platform_impl/web/web_sys/mod.rs
View file

@ -73,11 +73,17 @@ pub fn scale_factor(window: &web_sys::Window) -> f64 {
pub fn set_canvas_size(canvas: &Canvas, new_size: Size) { pub fn set_canvas_size(canvas: &Canvas, new_size: Size) {
let scale_factor = scale_factor(canvas.window()); let scale_factor = scale_factor(canvas.window());
let new_size = new_size.to_physical(scale_factor);
canvas.size().set(new_size); let physical_size = new_size.to_physical(scale_factor);
set_canvas_style_property(canvas.raw(), "width", &format!("{}px", new_size.width)); canvas.size().set(physical_size);
set_canvas_style_property(canvas.raw(), "height", &format!("{}px", new_size.height));
let logical_size = new_size.to_logical::<f64>(scale_factor);
set_canvas_style_property(canvas.raw(), "width", &format!("{}px", logical_size.width));
set_canvas_style_property(
canvas.raw(),
"height",
&format!("{}px", logical_size.height),
);
} }
pub fn set_canvas_style_property(raw: &HtmlCanvasElement, property: &str, value: &str) { pub fn set_canvas_style_property(raw: &HtmlCanvasElement, property: &str, value: &str) {