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

Iced 0.13 squash #175

Merged
merged 0 commits into from
Oct 18, 2024
Merged

Iced 0.13 squash #175

merged 0 commits into from
Oct 18, 2024

Conversation

wash2
Copy link

@wash2 wash2 commented Oct 17, 2024

This is up to date with upstream master, and refactors the sctk shell to be integrated into the winit shell. It's been tested with cosmic-settings, examples from libcosmic, cosmic-applets, and cosmic-launcher. It seems to be in a good state to me, but we may need to make small adjustments as we update some more apps.

@wash2 wash2 requested a review from a team October 17, 2024 17:13
@ryanabx
Copy link

ryanabx commented Oct 17, 2024

*totally definitely 100% reads through all 53000 lines of code* uhh LGTM?

In realness I'll test some things on my own application, but congratulations! This is a big deal 😎

@ryanabx
Copy link

ryanabx commented Oct 17, 2024

Two things to start


the sctk_todos example fails to run immediately with the scrollable content must not fill its vertical scrolling axis thing:

sctk_todos.log


I can't compile my iced application due to winit not having SuggestedBounds. Is this gated behind a feature I'm not using?

Compilation error:

   Compiling iced_winit v0.14.0-dev (https://github.com/pop-os/iced?branch=iced-0.13-squash#956dc807)
error[E0599]: no variant or associated item named `SuggestedBounds` found for enum `winit::event::WindowEvent` in the current scope
   --> /home/ryanbrue/.cargo/git/checkouts/iced-14fbad96f5d3e3c7/956dc80/winit/src/conversion.rs:309:22
    |
309 |         WindowEvent::SuggestedBounds(bounds) => {
    |                      ^^^^^^^^^^^^^^^ variant or associated item not found in `WindowEvent`

For more information about this error, try `rustc --explain E0599`.
error: could not compile `iced_winit` (lib) due to 1 previous error

My feature list:

iced = { git = "https://github.com/pop-os/iced", branch = "iced-0.13-squash", features = [ "wayland", "winit", "tiny-skia", "wgpu", "image", "svg", "fira-sans", "auto-detect-theme", "async-std" ] }

@wash2
Copy link
Author

wash2 commented Oct 18, 2024

Two things to start

the sctk_todos example fails to run immediately with the scrollable content must not fill its vertical scrolling axis thing:

sctk_todos.log

I can't compile my iced application due to winit not having SuggestedBounds. Is this gated behind a feature I'm not using?

Compilation error:

   Compiling iced_winit v0.14.0-dev (https://github.com/pop-os/iced?branch=iced-0.13-squash#956dc807)
error[E0599]: no variant or associated item named `SuggestedBounds` found for enum `winit::event::WindowEvent` in the current scope
   --> /home/ryanbrue/.cargo/git/checkouts/iced-14fbad96f5d3e3c7/956dc80/winit/src/conversion.rs:309:22
    |
309 |         WindowEvent::SuggestedBounds(bounds) => {
    |                      ^^^^^^^^^^^^^^^ variant or associated item not found in `WindowEvent`

For more information about this error, try `rustc --explain E0599`.
error: could not compile `iced_winit` (lib) due to 1 previous error

My feature list:

iced = { git = "https://github.com/pop-os/iced", branch = "iced-0.13-squash", features = [ "wayland", "winit", "tiny-skia", "wgpu", "image", "svg", "fira-sans", "auto-detect-theme", "async-std" ] }

Weird, sctk_todos runs fine on my machine. Ill double check that there is no Fill in a scrollable though. For the suggested bounds issue, maybe a cargo update would help?

Copy link
Member

@mmstick mmstick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should make a branch based on the current version of the master branch before force-pushing this.

@wash2
Copy link
Author

wash2 commented Oct 18, 2024

We should make a branch based on the current version of the master branch before force-pushing this.

Ok I'll make a branch and a tag for the current version

@ryanabx
Copy link

ryanabx commented Oct 18, 2024

Weird, sctk_todos runs fine on my machine. Ill double check that there is no Fill in a scrollable though. For the suggested bounds issue, maybe a cargo update would help?

I'll give it a try after work today!

@wash2
Copy link
Author

wash2 commented Oct 18, 2024

https://github.com/pop-os/iced/tree/libcosmic-iced-0.12 & https://github.com/pop-os/iced/releases/tag/libcosmic-v0.12

@wash2 wash2 merged commit 79e74f5 into master Oct 18, 2024
3 of 16 checks passed
@wash2 wash2 deleted the iced-0.13-squash branch October 18, 2024 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants