diff --git a/src/platform_impl/macos/util.rs b/src/platform_impl/macos/util.rs index e6b7c2d8..8110573a 100644 --- a/src/platform_impl/macos/util.rs +++ b/src/platform_impl/macos/util.rs @@ -1,8 +1,5 @@ -use objc2_foundation::{NSNotFound, NSRange, NSUInteger}; use tracing::trace; -pub static EMPTY_RANGE: NSRange = NSRange { location: NSNotFound as NSUInteger, length: 0 }; - macro_rules! trace_scope { ($s:literal) => { let _crate = $crate::platform_impl::platform::util::TraceGuard::new(module_path!(), $s); diff --git a/src/platform_impl/macos/view.rs b/src/platform_impl/macos/view.rs index 677d461a..2166da7e 100644 --- a/src/platform_impl/macos/view.rs +++ b/src/platform_impl/macos/view.rs @@ -14,8 +14,8 @@ use objc2_app_kit::{ }; use objc2_foundation::{ MainThreadMarker, NSArray, NSAttributedString, NSAttributedStringKey, NSCopying, - NSMutableAttributedString, NSObject, NSObjectProtocol, NSPoint, NSRange, NSRect, NSSize, - NSString, NSUInteger, + NSMutableAttributedString, NSNotFound, NSObject, NSObjectProtocol, NSPoint, NSRange, NSRect, + NSSize, NSString, NSUInteger, }; use super::app_delegate::ApplicationDelegate; @@ -25,7 +25,7 @@ use super::event::{ scancode_to_physicalkey, }; use super::window::WinitWindow; -use super::{util, DEVICE_ID}; +use super::DEVICE_ID; use crate::dpi::{LogicalPosition, LogicalSize}; use crate::event::{ DeviceEvent, ElementState, Ime, Modifiers, MouseButton, MouseScrollDelta, TouchPhase, @@ -259,14 +259,16 @@ declare_class!( if length > 0 { NSRange::new(0, length) } else { - util::EMPTY_RANGE + // Documented to return `{NSNotFound, 0}` if there is no marked range. + NSRange::new(NSNotFound as NSUInteger, 0) } } #[method(selectedRange)] fn selected_range(&self) -> NSRange { trace_scope!("selectedRange"); - util::EMPTY_RANGE + // Documented to return `{NSNotFound, 0}` if there is no selection. + NSRange::new(NSNotFound as NSUInteger, 0) } #[method(setMarkedText:selectedRange:replacementRange:)]