Skip to content

Commit

Permalink
use a variable instead of a fn for hard-coded check
Browse files Browse the repository at this point in the history
  • Loading branch information
netraptor committed Dec 1, 2024
1 parent 9419237 commit 6dba711
Showing 1 changed file with 23 additions and 22 deletions.
45 changes: 23 additions & 22 deletions winit/src/application/drag_resize.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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;

Expand Down Expand Up @@ -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<ResizeDirection>,
Expand Down

0 comments on commit 6dba711

Please sign in to comment.