Refactor Apple platform detection for keyboard input handling

- Replaced the previous `cfg_if` macro usage for detecting Apple platforms with a new `is_apple_platform` function in `lib.rs`, improving code readability
- Updated the `window_event` function in `event_loop.rs` to utilize the new `is_apple_platform` function for determining the `swap_cmd_ctrl` variable.
- Simplified the logic in `wasm_input_helper.rs` for checking if the platform is Apple by using the new function.
- Adjusted the `text_shortcut` method in `input.rs` to leverage the new platform detection, ensuring consistent behavior for keyboard shortcuts across Apple devices.

Author: arkus7

internal/backends/winit/event_loop.rs

@@ -203,22 +203,7 @@ impl winit::application::ApplicationHandler<SlintEvent> for EventLoopState {
             WindowEvent::KeyboardInput { event, is_synthetic, .. } => {
                 let key_code = event.logical_key;
                 // For now: Match Qt's behavior of mapping command to control and control to meta (LWin/RWin).
-                cfg_if::cfg_if!(
-                    if #[cfg(target_vendor = "apple")] {
-                        let swap_cmd_ctrl = true;
-                    } else if #[cfg(target_family = "wasm")] {
-                        let swap_cmd_ctrl = web_sys::window()
-                            .and_then(|window| window.navigator().platform().ok())
-                            .is_some_and(|platform| {
-                                let platform = platform.to_ascii_lowercase();
-                                platform.contains("mac")
-                                    || platform.contains("iphone")
-                                    || platform.contains("ipad")
-                            });
-                    } else {
-                        let swap_cmd_ctrl = false;
-                    }
-                );
+                let swap_cmd_ctrl = i_slint_core::is_apple_platform();
 
                 let key_code = if swap_cmd_ctrl {
                     match key_code {

internal/backends/winit/wasm_input_helper.rs

@@ -66,10 +66,7 @@ impl WasmInputHelper {
         let mut h = Self { input, canvas: canvas.clone() };
 
         // macos, or ipad with an attached keyboard, etc.
-        let is_apple = window.navigator().platform().ok().map_or(false, |platform| {
-            let platform = platform.to_ascii_lowercase();
-            platform.contains("mac") || platform.contains("iphone") || platform.contains("ipad")
-        });
+        let is_apple = i_slint_core::is_apple_platform();
 
         let shared_state = Rc::new(RefCell::new(WasmInputState::default()));
         #[cfg(web_sys_unstable_apis)]

internal/core/input.rs

@@ -354,22 +354,7 @@ impl KeyEvent {
     pub fn text_shortcut(&self) -> Option<TextShortcut> {
         let keycode = self.text.chars().next()?;
 
-        cfg_if::cfg_if!(
-            if #[cfg(target_vendor = "apple")] {
-                let is_apple = true;
-            } else if #[cfg(target_family = "wasm")] {
-                let is_apple = web_sys::window()
-                    .and_then(|window| window.navigator().platform().ok())
-                    .is_some_and(|platform| {
-                        let platform = platform.to_ascii_lowercase();
-                        platform.contains("mac")
-                            || platform.contains("iphone")
-                            || platform.contains("ipad")
-                    });
-            } else {
-                let is_apple = false;
-            }
-        );
+        let is_apple = crate::is_apple_platform();
 
         let move_mod = if is_apple {
             self.modifiers.alt && !self.modifiers.control && !self.modifiers.meta
@@ -416,24 +401,22 @@ impl KeyEvent {
             }
         }
 
-        if is_apple {
-            if self.modifiers.control {
-                match keycode {
-                    key_codes::LeftArrow => {
-                        return Some(TextShortcut::Move(TextCursorDirection::StartOfLine))
-                    }
-                    key_codes::RightArrow => {
-                        return Some(TextShortcut::Move(TextCursorDirection::EndOfLine))
-                    }
-                    key_codes::UpArrow => {
-                        return Some(TextShortcut::Move(TextCursorDirection::StartOfText))
-                    }
-                    key_codes::DownArrow => {
-                        return Some(TextShortcut::Move(TextCursorDirection::EndOfText))
-                    }
-                    _ => (),
-                };
-            }
+        if is_apple && self.modifiers.control {
+            match keycode {
+                key_codes::LeftArrow => {
+                    return Some(TextShortcut::Move(TextCursorDirection::StartOfLine))
+                }
+                key_codes::RightArrow => {
+                    return Some(TextShortcut::Move(TextCursorDirection::EndOfLine))
+                }
+                key_codes::UpArrow => {
+                    return Some(TextShortcut::Move(TextCursorDirection::StartOfText))
+                }
+                key_codes::DownArrow => {
+                    return Some(TextShortcut::Move(TextCursorDirection::EndOfText))
+                }
+                _ => (),
+            };
         }
 
         if let Ok(direction) = TextCursorDirection::try_from(keycode) {

internal/core/lib.rs

@@ -140,3 +140,8 @@ pub fn detect_operating_system() -> OperatingSystemType {
         OperatingSystemType::Other
     }
 }
+
+/// Returns true if the current platform is an Apple platform (macOS, iOS, iPadOS)
+pub fn is_apple_platform() -> bool {
+    matches!(detect_operating_system(), OperatingSystemType::Macos | OperatingSystemType::Ios)
+}