Skip to content

Commit d0bd525

Browse files
Bump accesskit to 0.18 and make it a workspace dependency (#5783)
This can't be merged until [kittest's accesskit is bumped](rerun-io/kittest#9) ~~and [a new version of rfd is released](PolyMeilex/rfd#240. --------- Co-authored-by: Lucas Meurer <[email protected]>
1 parent 77244cd commit d0bd525

File tree

9 files changed

+322
-369
lines changed

9 files changed

+322
-369
lines changed

Cargo.lock

+310-361
Large diffs are not rendered by default.

Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ egui_glow = { version = "0.31.1", path = "crates/egui_glow", default-features =
6868
egui_kittest = { version = "0.31.1", path = "crates/egui_kittest", default-features = false }
6969
eframe = { version = "0.31.1", path = "crates/eframe", default-features = false }
7070

71+
accesskit = "0.18.0"
72+
accesskit_winit = "0.24"
7173
ahash = { version = "0.8.11", default-features = false, features = [
7274
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
7375
"std",
@@ -83,7 +85,7 @@ glutin = { version = "0.32.0", default-features = false }
8385
glutin-winit = { version = "0.5.0", default-features = false }
8486
home = "0.5.9"
8587
image = { version = "0.25", default-features = false }
86-
kittest = { version = "0.1" }
88+
kittest = { version = "0.1.0", git = "https://github.com/rerun-io/kittest", branch = "main" }
8789
log = { version = "0.4", features = ["std"] }
8890
nohash-hasher = "0.2"
8991
parking_lot = "0.12"

crates/eframe/src/native/glow_integration.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ impl<'app> GlowWinitApp<'app> {
272272
..
273273
} = viewport
274274
{
275-
egui_winit.init_accesskit(window, event_loop_proxy);
275+
egui_winit.init_accesskit(event_loop, window, event_loop_proxy);
276276
}
277277
}
278278

crates/eframe/src/native/wgpu_integration.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ impl<'app> WgpuWinitApp<'app> {
249249
#[cfg(feature = "accesskit")]
250250
{
251251
let event_loop_proxy = self.repaint_proxy.lock().clone();
252-
egui_winit.init_accesskit(&window, event_loop_proxy);
252+
egui_winit.init_accesskit(event_loop, &window, event_loop_proxy);
253253
}
254254

255255
let app_creator = std::mem::take(&mut self.app_creator)

crates/egui-winit/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ winit = { workspace = true, default-features = false }
6767
#! ### Optional dependencies
6868

6969
# feature accesskit
70-
accesskit_winit = { version = "0.23", optional = true }
70+
accesskit_winit = { workspace = true, optional = true }
7171

7272
bytemuck = { workspace = true, optional = true }
7373

crates/egui-winit/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,14 @@ impl State {
166166
#[cfg(feature = "accesskit")]
167167
pub fn init_accesskit<T: From<accesskit_winit::Event> + Send>(
168168
&mut self,
169+
event_loop: &ActiveEventLoop,
169170
window: &Window,
170171
event_loop_proxy: winit::event_loop::EventLoopProxy<T>,
171172
) {
172173
profiling::function_scope!();
173174

174175
self.accesskit = Some(accesskit_winit::Adapter::with_event_loop_proxy(
176+
event_loop,
175177
window,
176178
event_loop_proxy,
177179
));

crates/egui/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ nohash-hasher.workspace = true
8989
profiling.workspace = true
9090

9191
#! ### Optional dependencies
92-
accesskit = { version = "0.17.0", optional = true }
92+
accesskit = { workspace = true, optional = true }
9393

9494
backtrace = { workspace = true, optional = true }
9595

crates/egui_demo_app/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ env_logger = { version = "0.10", default-features = false, features = [
8686
"auto-color",
8787
"humantime",
8888
] }
89-
rfd = { version = "0.15", optional = true }
89+
rfd = { version = "0.15.3", optional = true }
9090

9191
# web:
9292
[target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -95,4 +95,4 @@ wasm-bindgen-futures.workspace = true
9595
web-sys.workspace = true
9696

9797
[dev-dependencies]
98-
egui_kittest = { workspace = true, features = ["eframe", "snapshot", "wgpu"] }
98+
egui_kittest = { workspace = true, features = ["eframe", "snapshot", "wgpu"] }

examples/file_dialog/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ env_logger = { version = "0.10", default-features = false, features = [
2020
"auto-color",
2121
"humantime",
2222
] }
23-
rfd = "0.15"
23+
rfd = "0.15.3"

0 commit comments

Comments
 (0)