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.

Sign up for GitHub

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

Bump accesskit to 0.18 and make it a workspace dependency #5783

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Bump accesskit to 0.18 and make it a workspace dependency #5783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b125e84
Bump accesskit to 0.18 and make it a workspace dep
valadaptive Mar 12, 2025
f5c62fa
Switch back to real rfd release
valadaptive Mar 12, 2025
abfc433
Switch to rerun-io/kittest
valadaptive Mar 13, 2025
75a6b52
Fix duplicate hashbrown versions
valadaptive Mar 13, 2025
7f8f4a3
Specify kittest version
lucasmerlin Mar 14, 2025
8dfe0cf
Fix duplicate hashbrown
lucasmerlin Mar 14, 2025
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
671 changes: 310 additions & 361 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
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 = [
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
"std",
Expand All @@ -83,7 +85,7 @@ glutin = { version = "0.32.0", default-features = false }
glutin-winit = { version = "0.5.0", default-features = false }
home = "0.5.9"
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"] }
nohash-hasher = "0.2"
parking_lot = "0.12"
Expand Down
2 changes: 1 addition & 1 deletion crates/eframe/src/native/glow_integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/eframe/src/native/wgpu_integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion crates/egui-winit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
2 changes: 2 additions & 0 deletions crates/egui-winit/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
));
Expand Down
2 changes: 1 addition & 1 deletion crates/egui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
4 changes: 2 additions & 2 deletions crates/egui_demo_app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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"] }
2 changes: 1 addition & 1 deletion examples/file_dialog/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ env_logger = { version = "0.10", default-features = false, features = [
"auto-color",
"humantime",
] }
rfd = "0.15"
rfd = "0.15.3"