Skip to content

Commit f7f0444

Browse files
ilmaiilmai
committed
Rename is_os_version_at_least() to is_macos_version_at_least()
1 parent b80e203 commit f7f0444

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎plugin-canvas/src/platform/mac.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pub mod keyboard;
22
pub mod view;
33
pub mod window;
44

5-
fn is_os_version_at_least(major: isize, minor: isize, patch: isize) -> bool {
5+
fn is_macos_version_at_least(major: isize, minor: isize, patch: isize) -> bool {
66
let process_info = objc2_foundation::NSProcessInfo::processInfo();
77
let version = objc2_foundation::NSOperatingSystemVersion {
88
majorVersion: major,

‎plugin-canvas/src/platform/mac/window.rs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use objc2_foundation::{MainThreadMarker, NSArray, NSDefaultRunLoopMode, NSPoint,
99
use objc2_quartz_core::CADisplayLink;
1010
use raw_window_handle::{AppKitWindowHandle, HasDisplayHandle, HasWindowHandle, RawWindowHandle};
1111

12-
use crate::{Event, LogicalPosition, platform::{mac::is_os_version_at_least, os_window_handle::OsWindowHandle}, thread_bound::ThreadBound};
12+
use crate::{Event, LogicalPosition, platform::{mac::is_macos_version_at_least, os_window_handle::OsWindowHandle}, thread_bound::ThreadBound};
1313
use crate::error::Error;
1414
use crate::event::{EventCallback, EventResponse};
1515
use crate::platform::interface::OsWindowInterface;
@@ -61,7 +61,7 @@ impl OsWindowInterface for OsWindow {
6161
let (view, window_handle) = unsafe {
6262
let view: Allocated<OsWindowView> = msg_send![view_class, alloc];
6363
let view: Retained<OsWindowView> = msg_send![view, initWithFrame: view_rect];
64-
64+
6565
let tracking_area = NSTrackingArea::initWithRect_options_owner_userInfo(
6666
NSTrackingArea::alloc(),
6767
view_rect,
@@ -74,7 +74,7 @@ impl OsWindowInterface for OsWindow {
7474
);
7575
view.addTrackingArea(&tracking_area);
7676

77-
let dragged_types = if is_os_version_at_least(10, 13, 0) {
77+
let dragged_types = if is_macos_version_at_least(10, 13, 0) {
7878
NSArray::arrayWithObject(NSPasteboardTypeFileURL)
7979
} else {
8080
NSArray::new()
@@ -83,11 +83,11 @@ impl OsWindowInterface for OsWindow {
8383

8484
let parent_view: &mut NSView = &mut *(parent_window_handle.ns_view.as_ptr() as *mut NSView);
8585
parent_view.addSubview(&view);
86-
86+
8787
let window_handle = AppKitWindowHandle::new(
8888
NonNull::new(view.as_ref() as *const NSView as _).unwrap()
8989
);
90-
90+
9191
(view, window_handle)
9292
};
9393

@@ -106,7 +106,7 @@ impl OsWindowInterface for OsWindow {
106106

107107
let window = Arc::new(ThreadBound::new(window));
108108

109-
if is_os_version_at_least(14, 0, 0) {
109+
if is_macos_version_at_least(14, 0, 0) {
110110
let display_link = unsafe {
111111
let display_link = view.displayLinkWithTarget_selector(&view, sel!(onDisplayLinkNotify:));
112112
display_link.addToRunLoop_forMode(&NSRunLoop::mainRunLoop(), NSDefaultRunLoopMode);
@@ -120,7 +120,7 @@ impl OsWindowInterface for OsWindow {
120120
NSRunLoop::mainRunLoop().addTimer_forMode(timer.as_ref(), NSDefaultRunLoopMode);
121121
timer
122122
};
123-
123+
124124
*window.timer.borrow_mut() = Some(timer);
125125
}
126126

@@ -165,79 +165,79 @@ impl OsWindowInterface for OsWindow {
165165
CursorIcon::NotAllowed => NSCursor::operationNotAllowedCursor(),
166166
CursorIcon::Grab => NSCursor::openHandCursor(),
167167
CursorIcon::Grabbing => NSCursor::closedHandCursor(),
168-
CursorIcon::EResize => if is_os_version_at_least(15, 0, 0) {
168+
CursorIcon::EResize => if is_macos_version_at_least(15, 0, 0) {
169169
NSCursor::columnResizeCursorInDirections(NSHorizontalDirections::Right)
170170
} else {
171171
#[allow(deprecated)]
172172
NSCursor::resizeRightCursor()
173173
}
174-
CursorIcon::NResize => if is_os_version_at_least(15, 0, 0) {
174+
CursorIcon::NResize => if is_macos_version_at_least(15, 0, 0) {
175175
NSCursor::rowResizeCursorInDirections(NSVerticalDirections::Up)
176176
} else {
177177
#[allow(deprecated)]
178178
NSCursor::resizeUpCursor()
179179
}
180-
CursorIcon::NeResize => if is_os_version_at_least(15, 0, 0) {
180+
CursorIcon::NeResize => if is_macos_version_at_least(15, 0, 0) {
181181
NSCursor::frameResizeCursorFromPosition_inDirections(NSCursorFrameResizePosition::TopRight, NSCursorFrameResizeDirections::Outward)
182182
} else {
183183
NSCursor::arrowCursor()
184184
}
185-
CursorIcon::NwResize => if is_os_version_at_least(15, 0, 0) {
185+
CursorIcon::NwResize => if is_macos_version_at_least(15, 0, 0) {
186186
NSCursor::frameResizeCursorFromPosition_inDirections(NSCursorFrameResizePosition::TopLeft, NSCursorFrameResizeDirections::Outward)
187187
} else {
188188
NSCursor::arrowCursor()
189189
}
190-
CursorIcon::SResize => if is_os_version_at_least(15, 0, 0) {
190+
CursorIcon::SResize => if is_macos_version_at_least(15, 0, 0) {
191191
NSCursor::frameResizeCursorFromPosition_inDirections(NSCursorFrameResizePosition::TopLeft, NSCursorFrameResizeDirections::Outward)
192192
} else {
193193
#[allow(deprecated)]
194194
NSCursor::resizeDownCursor()
195195
}
196-
CursorIcon::SeResize => if is_os_version_at_least(15, 0, 0) {
196+
CursorIcon::SeResize => if is_macos_version_at_least(15, 0, 0) {
197197
NSCursor::frameResizeCursorFromPosition_inDirections(NSCursorFrameResizePosition::BottomRight, NSCursorFrameResizeDirections::Outward)
198198
} else {
199199
NSCursor::arrowCursor()
200200
}
201-
CursorIcon::SwResize => if is_os_version_at_least(15, 0, 0) {
201+
CursorIcon::SwResize => if is_macos_version_at_least(15, 0, 0) {
202202
NSCursor::frameResizeCursorFromPosition_inDirections(NSCursorFrameResizePosition::BottomLeft, NSCursorFrameResizeDirections::Outward)
203203
} else {
204204
NSCursor::arrowCursor()
205205
}
206-
CursorIcon::WResize => if is_os_version_at_least(15, 0, 0) {
206+
CursorIcon::WResize => if is_macos_version_at_least(15, 0, 0) {
207207
NSCursor::columnResizeCursorInDirections(NSHorizontalDirections::Left)
208208
} else {
209209
#[allow(deprecated)]
210210
NSCursor::resizeLeftCursor()
211211
}
212-
CursorIcon::EwResize => if is_os_version_at_least(15, 0, 0) {
212+
CursorIcon::EwResize => if is_macos_version_at_least(15, 0, 0) {
213213
NSCursor::columnResizeCursor()
214214
} else {
215215
#[allow(deprecated)]
216216
NSCursor::resizeLeftRightCursor()
217217
}
218-
CursorIcon::NsResize => if is_os_version_at_least(15, 0, 0) {
218+
CursorIcon::NsResize => if is_macos_version_at_least(15, 0, 0) {
219219
NSCursor::rowResizeCursor()
220220
} else {
221221
#[allow(deprecated)]
222222
NSCursor::resizeUpDownCursor()
223223
}
224-
CursorIcon::NeswResize => if is_os_version_at_least(15, 0, 0) {
224+
CursorIcon::NeswResize => if is_macos_version_at_least(15, 0, 0) {
225225
NSCursor::frameResizeCursorFromPosition_inDirections(NSCursorFrameResizePosition::TopRight, NSCursorFrameResizeDirections::All)
226226
} else {
227227
NSCursor::arrowCursor()
228228
}
229-
CursorIcon::NwseResize => if is_os_version_at_least(15, 0, 0) {
229+
CursorIcon::NwseResize => if is_macos_version_at_least(15, 0, 0) {
230230
NSCursor::frameResizeCursorFromPosition_inDirections(NSCursorFrameResizePosition::TopLeft, NSCursorFrameResizeDirections::All)
231231
} else {
232232
NSCursor::arrowCursor()
233233
}
234-
CursorIcon::ColResize => if is_os_version_at_least(15, 0, 0) {
234+
CursorIcon::ColResize => if is_macos_version_at_least(15, 0, 0) {
235235
NSCursor::columnResizeCursor()
236236
} else {
237237
#[allow(deprecated)]
238238
NSCursor::resizeLeftRightCursor()
239239
}
240-
CursorIcon::RowResize => if is_os_version_at_least(15, 0, 0) {
240+
CursorIcon::RowResize => if is_macos_version_at_least(15, 0, 0) {
241241
NSCursor::rowResizeCursor()
242242
} else {
243243
#[allow(deprecated)]
@@ -248,7 +248,7 @@ impl OsWindowInterface for OsWindow {
248248
CursorIcon::ZoomOut => NSCursor::arrowCursor(), // TODO
249249
_ => todo!(),
250250
};
251-
251+
252252
cursor.set();
253253

254254
if self.cursor_hidden.swap(false, Ordering::Relaxed) {
@@ -270,7 +270,7 @@ impl OsWindowInterface for OsWindow {
270270
let cg_point = CGPoint::new(screen_position.x, screen_height - screen_position.y);
271271
CGWarpMouseCursorPosition(cg_point);
272272
}
273-
273+
274274
fn poll_events(&self) -> Result<(), Error> {
275275
Ok(())
276276
}

0 commit comments

Comments
 (0)