Make accesskit module a top-level module within the winit backend crate

slint-ui · Jun 13, 2023 · 17139fa · 17139fa
1 parent 965d3c5
commit 17139fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...nds/winit/winitwindowadapter/accesskit.rs → internal/backends/winit/accesskit.rs b/...nds/winit/winitwindowadapter/accesskit.rs → internal/backends/winit/accesskit.rs
diff --git a/internal/backends/winit/lib.rs b/internal/backends/winit/lib.rs
@@ -53,6 +53,9 @@ mod renderer {
     pub(crate) mod sw;
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+mod accesskit;
+
 #[cfg(target_arch = "wasm32")]
 pub(crate) mod wasm_input_helper;
 

diff --git a/internal/backends/winit/winitwindowadapter.rs b/internal/backends/winit/winitwindowadapter.rs
@@ -35,9 +35,6 @@ use corelib::{graphics::*, Coord};
 use i_slint_core as corelib;
 use once_cell::unsync::OnceCell;
 
-#[cfg(not(target_arch = "wasm32"))]
-mod accesskit;
-
 fn position_to_winit(pos: &corelib::api::WindowPosition) -> winit::dpi::Position {
     match pos {
         corelib::api::WindowPosition::Logical(pos) => {
@@ -127,7 +124,7 @@ pub struct WinitWindowAdapter {
     virtual_keyboard_helper: RefCell<Option<super::wasm_input_helper::WasmInputHelper>>,
 
     #[cfg(not(target_arch = "wasm32"))]
-    pub accesskit_adapter: accesskit::AccessKitAdapter,
+    pub accesskit_adapter: crate::accesskit::AccessKitAdapter,
 }
 
 impl WinitWindowAdapter {
@@ -157,7 +154,10 @@ impl WinitWindowAdapter {
             #[cfg(target_arch = "wasm32")]
             virtual_keyboard_helper: Default::default(),
             #[cfg(not(target_arch = "wasm32"))]
-            accesskit_adapter: accesskit::AccessKitAdapter::new(self_weak.clone(), &*winit_window),
+            accesskit_adapter: crate::accesskit::AccessKitAdapter::new(
+                self_weak.clone(),
+                &*winit_window,
+            ),
         });
 
         let id = self_rc.winit_window().id();