Bump accesskit to 0.18 and make it a workspace dependency (#5783)
This can't be merged until [kittest's accesskit is bumped](https://github.com/rerun-io/kittest/pull/9) ~~and [a new version of rfd is released](https://github.com/PolyMeilex/rfd/pull/240)~~. --------- Co-authored-by: Lucas Meurer <lucasmeurer96@gmail.com>
This commit is contained in:
parent
77244cd4c5
commit
d0bd525b5d
679
Cargo.lock
679
Cargo.lock
File diff suppressed because it is too large
Load Diff
|
|
@ -68,6 +68,8 @@ egui_glow = { version = "0.31.1", path = "crates/egui_glow", default-features =
|
||||||
egui_kittest = { version = "0.31.1", path = "crates/egui_kittest", default-features = false }
|
egui_kittest = { version = "0.31.1", path = "crates/egui_kittest", default-features = false }
|
||||||
eframe = { version = "0.31.1", path = "crates/eframe", default-features = false }
|
eframe = { version = "0.31.1", path = "crates/eframe", default-features = false }
|
||||||
|
|
||||||
|
accesskit = "0.18.0"
|
||||||
|
accesskit_winit = "0.24"
|
||||||
ahash = { version = "0.8.11", default-features = false, features = [
|
ahash = { version = "0.8.11", default-features = false, features = [
|
||||||
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
|
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
|
||||||
"std",
|
"std",
|
||||||
|
|
@ -83,7 +85,7 @@ glutin = { version = "0.32.0", default-features = false }
|
||||||
glutin-winit = { version = "0.5.0", default-features = false }
|
glutin-winit = { version = "0.5.0", default-features = false }
|
||||||
home = "0.5.9"
|
home = "0.5.9"
|
||||||
image = { version = "0.25", default-features = false }
|
image = { version = "0.25", default-features = false }
|
||||||
kittest = { version = "0.1" }
|
kittest = { version = "0.1.0", git = "https://github.com/rerun-io/kittest", branch = "main" }
|
||||||
log = { version = "0.4", features = ["std"] }
|
log = { version = "0.4", features = ["std"] }
|
||||||
nohash-hasher = "0.2"
|
nohash-hasher = "0.2"
|
||||||
parking_lot = "0.12"
|
parking_lot = "0.12"
|
||||||
|
|
|
||||||
|
|
@ -272,7 +272,7 @@ impl<'app> GlowWinitApp<'app> {
|
||||||
..
|
..
|
||||||
} = viewport
|
} = viewport
|
||||||
{
|
{
|
||||||
egui_winit.init_accesskit(window, event_loop_proxy);
|
egui_winit.init_accesskit(event_loop, window, event_loop_proxy);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -249,7 +249,7 @@ impl<'app> WgpuWinitApp<'app> {
|
||||||
#[cfg(feature = "accesskit")]
|
#[cfg(feature = "accesskit")]
|
||||||
{
|
{
|
||||||
let event_loop_proxy = self.repaint_proxy.lock().clone();
|
let event_loop_proxy = self.repaint_proxy.lock().clone();
|
||||||
egui_winit.init_accesskit(&window, event_loop_proxy);
|
egui_winit.init_accesskit(event_loop, &window, event_loop_proxy);
|
||||||
}
|
}
|
||||||
|
|
||||||
let app_creator = std::mem::take(&mut self.app_creator)
|
let app_creator = std::mem::take(&mut self.app_creator)
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ winit = { workspace = true, default-features = false }
|
||||||
#! ### Optional dependencies
|
#! ### Optional dependencies
|
||||||
|
|
||||||
# feature accesskit
|
# feature accesskit
|
||||||
accesskit_winit = { version = "0.23", optional = true }
|
accesskit_winit = { workspace = true, optional = true }
|
||||||
|
|
||||||
bytemuck = { workspace = true, optional = true }
|
bytemuck = { workspace = true, optional = true }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -166,12 +166,14 @@ impl State {
|
||||||
#[cfg(feature = "accesskit")]
|
#[cfg(feature = "accesskit")]
|
||||||
pub fn init_accesskit<T: From<accesskit_winit::Event> + Send>(
|
pub fn init_accesskit<T: From<accesskit_winit::Event> + Send>(
|
||||||
&mut self,
|
&mut self,
|
||||||
|
event_loop: &ActiveEventLoop,
|
||||||
window: &Window,
|
window: &Window,
|
||||||
event_loop_proxy: winit::event_loop::EventLoopProxy<T>,
|
event_loop_proxy: winit::event_loop::EventLoopProxy<T>,
|
||||||
) {
|
) {
|
||||||
profiling::function_scope!();
|
profiling::function_scope!();
|
||||||
|
|
||||||
self.accesskit = Some(accesskit_winit::Adapter::with_event_loop_proxy(
|
self.accesskit = Some(accesskit_winit::Adapter::with_event_loop_proxy(
|
||||||
|
event_loop,
|
||||||
window,
|
window,
|
||||||
event_loop_proxy,
|
event_loop_proxy,
|
||||||
));
|
));
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ nohash-hasher.workspace = true
|
||||||
profiling.workspace = true
|
profiling.workspace = true
|
||||||
|
|
||||||
#! ### Optional dependencies
|
#! ### Optional dependencies
|
||||||
accesskit = { version = "0.17.0", optional = true }
|
accesskit = { workspace = true, optional = true }
|
||||||
|
|
||||||
backtrace = { workspace = true, optional = true }
|
backtrace = { workspace = true, optional = true }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ env_logger = { version = "0.10", default-features = false, features = [
|
||||||
"auto-color",
|
"auto-color",
|
||||||
"humantime",
|
"humantime",
|
||||||
] }
|
] }
|
||||||
rfd = { version = "0.15", optional = true }
|
rfd = { version = "0.15.3", optional = true }
|
||||||
|
|
||||||
# web:
|
# web:
|
||||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||||
|
|
@ -95,4 +95,4 @@ wasm-bindgen-futures.workspace = true
|
||||||
web-sys.workspace = true
|
web-sys.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
egui_kittest = { workspace = true, features = ["eframe", "snapshot", "wgpu"] }
|
egui_kittest = { workspace = true, features = ["eframe", "snapshot", "wgpu"] }
|
||||||
|
|
|
||||||
|
|
@ -20,4 +20,4 @@ env_logger = { version = "0.10", default-features = false, features = [
|
||||||
"auto-color",
|
"auto-color",
|
||||||
"humantime",
|
"humantime",
|
||||||
] }
|
] }
|
||||||
rfd = "0.15"
|
rfd = "0.15.3"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue