Skip to content

fix: Use raw-window-handle 0.6 #310

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

Merged
mwcampbell merged 1 commit into from
Nov 4, 2023
Merged

fix: Use raw-window-handle 0.6 #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 2 additions & 11 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions platforms/winit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readme = "README.md"
edition = "2021"

[package.metadata.docs.rs]
features = ["winit/rwh_05", "winit/x11", "winit/wayland"]
features = ["winit/rwh_06", "winit/x11", "winit/wayland"]

[features]
default = ["accesskit_unix", "async-io"]
Expand All @@ -20,8 +20,7 @@ tokio = ["accesskit_unix/tokio"]

[dependencies]
accesskit = { version = "0.12.0", path = "../../common" }
raw-window-handle = "0.5"
winit = { version = "0.29", default-features = false, features = ["rwh_05"] }
winit = { version = "0.29", default-features = false, features = ["rwh_06"] }

[target.'cfg(target_os = "windows")'.dependencies]
accesskit_windows = { version = "0.15.0", path = "../windows" }
Expand All @@ -35,4 +34,4 @@ accesskit_unix = { version = "0.6.0", path = "../unix", optional = true, default
[dev-dependencies.winit]
version = "0.29"
default-features = false
features = ["rwh_05", "x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
features = ["rwh_06", "x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
11 changes: 7 additions & 4 deletions platforms/winit/src/platform_impl/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@

use accesskit::{ActionHandler, TreeUpdate};
use accesskit_macos::SubclassingAdapter;
use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
use winit::{event::WindowEvent, window::Window};
use winit::{
event::WindowEvent,
raw_window_handle::{HasWindowHandle, RawWindowHandle},
window::Window,
};

pub type ActionHandlerBox = Box<dyn ActionHandler>;

Expand All @@ -19,8 +22,8 @@ impl Adapter {
source: impl 'static + FnOnce() -> TreeUpdate,
action_handler: ActionHandlerBox,
) -> Self {
let view = match window.raw_window_handle() {
RawWindowHandle::AppKit(handle) => handle.ns_view,
let view = match window.window_handle().unwrap().as_raw() {
RawWindowHandle::AppKit(handle) => handle.ns_view.as_ptr(),
RawWindowHandle::UiKit(_) => unimplemented!(),
_ => unreachable!(),
};
Expand Down
13 changes: 8 additions & 5 deletions platforms/winit/src/platform_impl/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@

use accesskit::{ActionHandler, TreeUpdate};
use accesskit_windows::{SubclassingAdapter, HWND};
use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
use winit::{event::WindowEvent, window::Window};
use winit::{
event::WindowEvent,
raw_window_handle::{HasWindowHandle, RawWindowHandle},
window::Window,
};

pub type ActionHandlerBox = Box<dyn ActionHandler + Send>;

Expand All @@ -19,11 +22,11 @@ impl Adapter {
source: impl 'static + FnOnce() -> TreeUpdate,
action_handler: ActionHandlerBox,
) -> Self {
let hwnd = HWND(match window.raw_window_handle() {
RawWindowHandle::Win32(handle) => handle.hwnd as isize,
let hwnd = match window.window_handle().unwrap().as_raw() {
RawWindowHandle::Win32(handle) => HWND(handle.hwnd.get()),
RawWindowHandle::WinRt(_) => unimplemented!(),
_ => unreachable!(),
});
};
let adapter = SubclassingAdapter::new(hwnd, source, action_handler);
Self { adapter }
}
Expand Down