mirror of
https://github.com/emilk/egui.git
synced 2026-09-01 22:30:03 -04:00
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:
@@ -272,7 +272,7 @@ impl<'app> GlowWinitApp<'app> {
|
||||
..
|
||||
} = 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")]
|
||||
{
|
||||
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)
|
||||
|
||||
@@ -67,7 +67,7 @@ winit = { workspace = true, default-features = false }
|
||||
#! ### Optional dependencies
|
||||
|
||||
# feature accesskit
|
||||
accesskit_winit = { version = "0.23", optional = true }
|
||||
accesskit_winit = { workspace = true, optional = true }
|
||||
|
||||
bytemuck = { workspace = true, optional = true }
|
||||
|
||||
|
||||
@@ -166,12 +166,14 @@ impl State {
|
||||
#[cfg(feature = "accesskit")]
|
||||
pub fn init_accesskit<T: From<accesskit_winit::Event> + Send>(
|
||||
&mut self,
|
||||
event_loop: &ActiveEventLoop,
|
||||
window: &Window,
|
||||
event_loop_proxy: winit::event_loop::EventLoopProxy<T>,
|
||||
) {
|
||||
profiling::function_scope!();
|
||||
|
||||
self.accesskit = Some(accesskit_winit::Adapter::with_event_loop_proxy(
|
||||
event_loop,
|
||||
window,
|
||||
event_loop_proxy,
|
||||
));
|
||||
|
||||
@@ -89,7 +89,7 @@ nohash-hasher.workspace = true
|
||||
profiling.workspace = true
|
||||
|
||||
#! ### Optional dependencies
|
||||
accesskit = { version = "0.17.0", optional = true }
|
||||
accesskit = { workspace = true, optional = true }
|
||||
|
||||
backtrace = { workspace = true, optional = true }
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ env_logger = { version = "0.10", default-features = false, features = [
|
||||
"auto-color",
|
||||
"humantime",
|
||||
] }
|
||||
rfd = { version = "0.15", optional = true }
|
||||
rfd = { version = "0.15.3", optional = true }
|
||||
|
||||
# web:
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||
@@ -95,4 +95,4 @@ wasm-bindgen-futures.workspace = true
|
||||
web-sys.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
egui_kittest = { workspace = true, features = ["eframe", "snapshot", "wgpu"] }
|
||||
egui_kittest = { workspace = true, features = ["eframe", "snapshot", "wgpu"] }
|
||||
|
||||
Reference in New Issue
Block a user