paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 11:40:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: the cursor has better compatibility when switching windows at design time

Browse Source
This commit is contained in:
rich2014 2023-07-27 21:42:26 +08:00
parent ead28bdcc6
commit 285d0248e2
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lcl/interfaces/cocoa/cocoawscommon.pas
View File

@ -28,7 +28,7 @@ type
procedure SetNewCursor( newCursor:TCocoaCursor );
public
class procedure SetCursorOnActive;
class procedure SetCurrentControlCursor;
class procedure SetCursorAtMousePos;
class procedure SetScreenCursor;
class procedure SetScreenCursorWhenNotDefault;
end;
@ -375,7 +375,7 @@ begin
if Screen.Cursor<>crDefault then
SetScreenCursor
else
SetCurrentControlCursor;
SetCursorAtMousePos;
end;
procedure TCursorHelper.SetNewCursor( newCursor:TCocoaCursor );
@ -396,15 +396,29 @@ begin
Application.QueueAsyncCall( @CursorHelper.DoSetCursorOnActive, 0 );
end;
class procedure TCursorHelper.SetCurrentControlCursor;
class procedure TCursorHelper.SetCursorAtMousePos;
var
P: TPoint;
control: TControl;
rect: NSRect;
window: NSWindow;
event: NSEvent;
begin
window:= NSAPP.keyWindow;
if not (Assigned(window) and Assigned(window.lclGetCallback)) then
exit;
GetCursorPos(P);
control:= FindControlAtPosition(P, true);
if Assigned(control) then
TCocoaCursor(Screen.Cursors[control.Cursor]).SetCursor;
rect:= NSZeroRect;
rect.origin:= LCLToNSPoint(P, window.screen.frame.size.height);
rect:= window.convertRectFromScreen(rect);
event:= NSEvent.mouseEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_clickCount_pressure(
NSMouseMoved,
rect.origin, 0, 0,
window.windowNumber, nil, 0, 0, 0);
window.lclGetCallback.MouseMove(event);
end;
class procedure TCursorHelper.SetScreenCursor;