From 5b6b7955cb86e7660ab3d09af65bb8ef442f5922 Mon Sep 17 00:00:00 2001 From: rich2014 Date: Sun, 30 Jul 2023 17:12:58 +0800 Subject: [PATCH] Cocoa: simplify TCursorHelper by b184a37 --- lcl/interfaces/cocoa/cocoawscommon.pas | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/lcl/interfaces/cocoa/cocoawscommon.pas b/lcl/interfaces/cocoa/cocoawscommon.pas index 6ed445eb7b..28542a3354 100644 --- a/lcl/interfaces/cocoa/cocoawscommon.pas +++ b/lcl/interfaces/cocoa/cocoawscommon.pas @@ -22,8 +22,6 @@ type TCursorHelper = class private _lastCursor: NSCursor; - private - procedure DoSetCursorOnActive( data:IntPtr ); public procedure SetNewCursor( newCursor:TCocoaCursor ); public @@ -370,14 +368,6 @@ end; { TCursorHelper } -procedure TCursorHelper.DoSetCursorOnActive( data:IntPtr ); -begin - if Screen.Cursor<>crDefault then - SetScreenCursor - else - SetCursorAtMousePos; -end; - procedure TCursorHelper.SetNewCursor( newCursor:TCocoaCursor ); var currentCursor: NSCursor; @@ -393,7 +383,10 @@ end; class procedure TCursorHelper.SetCursorOnActive; begin CursorHelper._lastCursor:= nil; - Application.QueueAsyncCall( @CursorHelper.DoSetCursorOnActive, 0 ); + if Screen.Cursor<>crDefault then + SetScreenCursor + else + SetCursorAtMousePos; end; class procedure TCursorHelper.SetCursorAtMousePos;