Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update winit to 0.29 #2169

Merged
merged 18 commits into from
Jan 17, 2024
Merged

Update winit to 0.29 #2169

merged 18 commits into from
Jan 17, 2024

Conversation

hecrj
Copy link
Member

@hecrj hecrj commented Dec 15, 2023

This PR updates our winit fork with the latest changes in 0.29.

Fixes #2113.
Fixes #2138.

@hecrj hecrj added bug Something isn't working shell change fix labels Dec 15, 2023
@hecrj hecrj added this to the 0.12 milestone Dec 15, 2023
winit/src/conversion.rs Outdated Show resolved Hide resolved
@dtzxporter
Copy link
Contributor

dtzxporter commented Dec 18, 2023

Posting here for visibility:

This also fixes the reentrant mutex issue I reported a while ago.

However, after switching to this commit, requesting redraw/redrawing an image constantly makes the window redraw really slow. It's slower the bigger the window is. The Iced debug overlay doesn't show increased times when the issue happens so it's likely something outside of iced rendering.

Edit:
Tested on macOS and windows. No noticeable lag on macOS. Extreme choppiness on windows.

@dtzxporter
Copy link
Contributor

dtzxporter commented Dec 18, 2023

I believe it's some sort of scheduling issue. There are no outliers in the flamegraph which corresponds with iced's debug overlay not having increased times. Even the spinner example gets choppy sometimes now on the winit branch and it doesn't on the latest master.

@ple1n
Copy link

ple1n commented Dec 28, 2023

Yeah please do this gets the window shadow drawn

@ple1n
Copy link

ple1n commented Dec 28, 2023

No, in cargo tree it shows sctk-adwaita is at 0.7.0.

sctk-adwaita at v0.8.0 has shadows.

@PolyMeilex
Copy link
Contributor

No, in cargo tree it shows sctk-adwaita is at 0.7.0.

sctk-adwaita at v0.8.0 has shadows.

winit 0.29.4 depends on sctk-adwaita 0.8, so not sure what has happend in your case, perhaps try cargo update to bump your cargo lock

@PolyMeilex
Copy link
Contributor

Nevermind that, I forgot that iced is using a fork of winit (that does not use 0.8 yet): https://github.com/iced-rs/winit/blob/3bcdb9abcd7459978ec689523bc21943d38da0f9/Cargo.toml#L163

@elevenhsoft
Copy link

Updating winit to work with sctk-adwaita > 0.8.0 require adding only 1 arguments like so

image

@hecrj hecrj changed the title Update winit to 0.29.4 Update winit to 0.29 Jan 2, 2024
@hecrj hecrj enabled auto-merge January 17, 2024 07:12
@hecrj hecrj merged commit 0001a6d into master Jan 17, 2024
26 checks passed
@hecrj hecrj deleted the update-winit branch January 17, 2024 07:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working change fix shell
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Text Editor inserts the character even on the command modifier invalid setDrawableSize on MacOS Sonoma 14.0
5 participants