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 to wayland-rs 0.30 #22

Merged
merged 1 commit into from
Apr 13, 2023

Conversation

kchibisov
Copy link
Contributor

This should update the sctk-adwaita to the latest smithay-client-toolkit and wayland-rs.

--

While I was at it, I've decided to cleanup the implementation given that the math was messy, I'm not saying that it's much better, but at least it's more readable, be aware that I was
touching only the parts related to wayland-rs udpate.

The diff might scare you, but it's mostly due to example change, the diff stat for src is the
following:

 src/buttons.rs | 474 +++++++++++++++++++++++++----------------------------------------
 src/lib.rs     | 983 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------
 src/parts.rs   | 281 +++++++++++++++++++--------------------
 src/pointer.rs | 328 ++++++++++++++-------------------------------
 src/surface.rs | 154 ---------------------
 src/theme.rs   | 126 +++++++++---------
 src/title.rs   |   2 +-
 7 files changed, 894 insertions(+), 1454 deletions(-)

Which removed all the inner mutability, mostly all code duplication, and so on.

I'm not entirely sure what to add to the CHANGELOG though... I know that I've fixed constructor the for the FrameConfig (made it public), not sure if it really matters...

@kchibisov
Copy link
Contributor Author

As discussed on #smithay, I think this supersedes the #21.

@kchibisov
Copy link
Contributor Author

Ah, there's a bug in sctk build script, so that's why CI fails, will update my branch.

@kchibisov kchibisov force-pushed the update-wayland-rs-030 branch 2 times, most recently from ea20e6f to 428c9e1 Compare March 8, 2023 16:42
@kchibisov kchibisov force-pushed the update-wayland-rs-030 branch from 428c9e1 to d3861e6 Compare March 17, 2023 04:24
@kchibisov kchibisov force-pushed the update-wayland-rs-030 branch from d3861e6 to 2d19edc Compare March 25, 2023 01:11
@kchibisov
Copy link
Contributor Author

The SCTK patches were merged, so nothing will be changed from my side.

@PolyMeilex
Copy link
Owner

In general, this looks good to me, not sure how to handle lack of SCTK release tho.

@kchibisov
Copy link
Contributor Author

I'll ping you once it'll be released, because it should be soon™.

This should update the sctk-adwaita to the latest smithay-client-toolkit
and wayland-rs.
@kchibisov kchibisov force-pushed the update-wayland-rs-030 branch from 2d19edc to dce9016 Compare April 5, 2023 07:45
@kchibisov
Copy link
Contributor Author

@PolyMeilex now it should be good to go.

I've also updated the Cargo.toml to make memmap2 optional, since it's used only by ab_glyph backend.

@PolyMeilex PolyMeilex merged commit df5b2fc into PolyMeilex:master Apr 13, 2023
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.

2 participants