From 1b8a399ebd40300706fb0a995810b194a489052f Mon Sep 17 00:00:00 2001 From: Matt George Date: Sun, 1 Dec 2024 04:51:18 -0700 Subject: [PATCH] use a variable instead of a fn for hard-coded check --- winit/src/application/drag_resize.rs | 45 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/winit/src/application/drag_resize.rs b/winit/src/application/drag_resize.rs index ba77f6a5..d7a30a6c 100644 --- a/winit/src/application/drag_resize.rs +++ b/winit/src/application/drag_resize.rs @@ -1,5 +1,27 @@ use winit::window::{CursorIcon, ResizeDirection}; +#[cfg(any( + all( + unix, + not(target_vendor = "apple"), + not(target_os = "android"), + not(target_os = "emscripten"), + ), + target_os = "windows", +))] +const DRAG_RESIZE_SUPPORTED: bool = true; + +#[cfg(not(any( + all( + unix, + not(target_vendor = "apple"), + not(target_os = "android"), + not(target_os = "emscripten"), + ), + target_os = "windows", +)))] +const DRAG_RESIZE_SUPPORTED: bool = false; + /// If supported by winit, returns a closure that implements cursor resize support. pub fn event_func( window: &dyn winit::window::Window, @@ -12,7 +34,7 @@ pub fn event_func( ) -> bool, >, > { - if drag_resize_supported() { + if DRAG_RESIZE_SUPPORTED { // Keep track of cursor when it is within a resizeable border. let mut cursor_prev_resize_direction = None; @@ -62,27 +84,6 @@ pub fn event_func( } } -/// Test if the current target should be assumed to have winit drag_resize support -const fn drag_resize_supported() -> bool { - #[cfg(all( - unix, - not(target_vendor = "apple"), - not(target_os = "android"), - not(target_os = "emscripten") - ))] - { - return true; - } - - #[cfg(target_os = "windows")] - { - return true; - } - - #[allow(unreachable_code)] - false -} - /// Get the cursor icon that corresponds to the resize direction. fn resize_direction_cursor_icon( resize_direction: Option,