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

Upgrade winit to 0.30.2 #4849

Merged
merged 26 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
00c282d
Initial conversion to winit 0.30
ArthurBrussee Jul 18, 2024
5294cae
Pin to 0.30.0 as 0.30.1+ has a bug that crashes on mac :/
ArthurBrussee Jul 18, 2024
3f42b72
Builder -> attributes
ArthurBrussee Jul 18, 2024
2e6c0d3
Add link to problematic winit PR
ArthurBrussee Jul 18, 2024
4f0e7d5
Update WinitApp integration to be more like ApplicationHandler
ArthurBrussee Jul 18, 2024
4623863
Fix for windows & linux
ArthurBrussee Jul 18, 2024
eafed08
Use more modern accesskit lazy init
ArthurBrussee Jul 18, 2024
e6741d2
Fixup comments
ArthurBrussee Jul 18, 2024
f37e52b
Update to latest accesskit and accesskit_winit
DataTriny Jul 19, 2024
fd3e552
Merge pull request #1 from DataTriny/fix-accesskit
ArthurBrussee Jul 19, 2024
cd894eb
Fixes for linux
ArthurBrussee Jul 19, 2024
d90b565
Merge remote-tracking branch 'origin/master' into winit-update
ArthurBrussee Jul 19, 2024
5e0f479
CI fixes
ArthurBrussee Jul 19, 2024
67c456b
Add a comment about wayland-cursor.
ArthurBrussee Jul 19, 2024
6d582f5
Fix crash when using winit 0.30.4
ArthurBrussee Jul 26, 2024
2f4dbaf
Enable nix/fs feature workaround in x11 too
ArthurBrussee Jul 26, 2024
af1c892
Remove leftover comment
ArthurBrussee Jul 26, 2024
c10e3fb
Managed to leave in some typos...
ArthurBrussee Jul 26, 2024
d9905d8
Merge branch 'master' into winit-update
emilk Jul 30, 2024
f10cf80
Fix request_repaint_after
ArthurBrussee Jul 30, 2024
1bbb312
Adress some review comments.
ArthurBrussee Jul 30, 2024
81fd86c
Pin winit, fix wayland dependency issues again.
ArthurBrussee Jul 30, 2024
e4fa5f9
Move `wayland-cursor` dependency to fix Windows build
emilk Jul 30, 2024
ba7cb00
fix typo
emilk Jul 30, 2024
48f402e
Remove duplicate dependency on `async-channel`
emilk Jul 30, 2024
8f337c7
ignore duplicated crate futures-lite
emilk Jul 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update to latest accesskit and accesskit_winit
  • Loading branch information
DataTriny committed Jul 19, 2024
commit f37e52b6eb2b24187bbe865347d40fe134383e16
28 changes: 14 additions & 14 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"

[[package]]
name = "accesskit"
version = "0.15.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ac5b518d65f20dc920b3a7bb92bb2b90cdb301416f27c2a55a128cd99f75c0c"
checksum = "e4700bdc115b306d6c43381c344dc307f03b7f0460c304e4892c309930322bd7"
dependencies = [
"enumn",
"serde",
]

[[package]]
name = "accesskit_atspi_common"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97d50c9c8c4e3ad243b8a567ddf3595c6eb064304b76baf246bb069700e03a2e"
checksum = "a1de72dc7093910a1284cef784b6b143bab0a34d67f6178e4fc3aaaf29a09f8b"
dependencies = [
"accesskit",
"accesskit_consumer",
Expand All @@ -44,19 +44,19 @@ dependencies = [

[[package]]
name = "accesskit_consumer"
version = "0.23.0"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17fa06310c6256253ef3474cb4694346222b4bca85a53aec7f796a73d18e7082"
checksum = "fe3a07a32ab5837ad83db3230ac490c8504c2cd5b90ac8c00db6535f6ed65d0b"
dependencies = [
"accesskit",
"immutable-chunkmap",
]

[[package]]
name = "accesskit_macos"
version = "0.16.0"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46a3c2a5bb8b5e403502faff2bbb85de5c14bb822a0ba7e9561cb5229b42a176"
checksum = "a189d159c153ae0fce5f9eefdcfec4a27885f453ce5ef0ccf078f72a73c39d34"
dependencies = [
"accesskit",
"accesskit_consumer",
Expand All @@ -68,9 +68,9 @@ dependencies = [

[[package]]
name = "accesskit_unix"
version = "0.11.1"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8b8bfe5d626a7a0ae929df970857b3738198c66dfbf27a8d60d199e29bf2836"
checksum = "b76c448cfd96d16131a9ad3ab786d06951eb341cdac1db908978ab010245a19d"
dependencies = [
"accesskit",
"accesskit_atspi_common",
Expand All @@ -86,9 +86,9 @@ dependencies = [

[[package]]
name = "accesskit_windows"
version = "0.21.0"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2ab7baf1a8adacddc2c5a4f14d1f936f73a0f0e1c6d4592514992c4d4c57743"
checksum = "682d8c4fb425606f97408e7577793f32e96310b646fa77662eb4216293eddc7f"
dependencies = [
"accesskit",
"accesskit_consumer",
Expand All @@ -99,9 +99,9 @@ dependencies = [

[[package]]
name = "accesskit_winit"
version = "0.21.1"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e8201853811d37a43c4753753d89d86802913be12496e5d77c1a418f7f2eaac"
checksum = "9afbd6d598b7c035639ad2b664aa0edc94c93dc1fc3ebb4b40d8a95fcd43ffac"
dependencies = [
"accesskit",
"accesskit_macos",
Expand Down
2 changes: 1 addition & 1 deletion crates/egui-winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ winit = { workspace = true, default-features = false, features = ["rwh_06"] }
#! ### Optional dependencies

# feature accesskit
accesskit_winit = { version = "0.21.1", optional = true }
accesskit_winit = { version = "0.22", optional = true }

## Enable this when generating docs.
document-features = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/egui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ ahash.workspace = true
nohash-hasher.workspace = true

#! ### Optional dependencies
accesskit = { version = "0.15", optional = true }
accesskit = { version = "0.16", optional = true }

backtrace = { workspace = true, optional = true }

Expand Down
2 changes: 1 addition & 1 deletion crates/egui/src/response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ impl Response {

self.fill_accesskit_node_common(builder);
builder.set_role(match info.typ {
WidgetType::Label => Role::StaticText,
WidgetType::Label => Role::Label,
WidgetType::Link => Role::Link,
WidgetType::TextEdit => Role::TextInput,
WidgetType::Button | WidgetType::ImageButton | WidgetType::CollapsingHeader => {
Expand Down
2 changes: 1 addition & 1 deletion crates/egui/src/text_selection/label_text_selection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fn paint_selection(
ui.ctx(),
_response.id,
cursor_range,
accesskit::Role::StaticText,
accesskit::Role::Label,
galley_pos,
galley,
);
Expand Down