paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-05 07:58:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: forcing keep of the object on MouseMove call from the tracking event

Browse Source 
git-svn-id: trunk@58849 -
This commit is contained in:
dmitry 2018-09-04 03:15:27 +00:00
parent 84ed77f0ce
commit 80d14feaba
3 changed files with 62 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/interfaces/cocoa/cocoaint.pas
View File

@ -389,7 +389,9 @@ begin
and isMouseMoveEvent(Result.type_)
then begin
cb := TrackedControl.lclGetCallback;
if Assigned(cb) then cb.MouseMove(Result);
if Assigned(cb) then
// making sure that the only the same control is called
cb.MouseMove(Result, true);
end;
end;

2
lcl/interfaces/cocoa/cocoaprivate.pp
View File

@ -49,7 +49,7 @@ type
// mouse events
function MouseUpDownEvent(Event: NSEvent; AForceAsMouseUp: Boolean = False; AOverrideBlock: Boolean = False): Boolean;
procedure MouseClick;
function MouseMove(Event: NSEvent): Boolean;
function MouseMove(Event: NSEvent; AForceObject: Boolean = False): Boolean;
function KeyEvent(Event: NSEvent; AForceAsKeyDown: Boolean = False): Boolean;
procedure KeyEvPrepare(Event: NSEvent; AForceAsKeyDown: Boolean = False);

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

@ -73,7 +73,7 @@ type
procedure KeyEvAfter;
procedure MouseClick; virtual;
function MouseMove(Event: NSEvent): Boolean; virtual;
function MouseMove(Event: NSEvent; AForceObject: Boolean): Boolean; virtual;
function scrollWheel(Event: NSEvent): Boolean; virtual;
procedure frameDidChange(sender: id); virtual;
procedure boundsDidChange(sender: id); virtual;
@ -1231,7 +1231,7 @@ begin
end;
end;
function TLCLCommonCallback.MouseMove(Event: NSEvent): Boolean;
function TLCLCommonCallback.MouseMove(Event: NSEvent; AForceObject: Boolean): Boolean;
var
Msg: TLMMouseMove;
MousePos: NSPoint;
@ -1258,64 +1258,67 @@ begin
MousePos := Event.locationInWindow;
OffsetMousePos(MousePos, bndPt, clPt);
rect:=Owner.lclClientFrame;
targetControl:=nil;
if not AForceObject then
begin
rect:=Owner.lclClientFrame;
targetControl:=nil;
callback := GetCaptureControlCallback();
if callback <> nil then
begin
FIsEventRouting:=true;
Result := callback.MouseMove(Event);
FIsEventRouting:=false;
exit;
end
else
begin
rect:=Target.BoundsRect;
OffsetRect(rect, -rect.Left, -rect.Top);
if (event.type_ = NSMouseMoved) and (not Types.PtInRect(rect, bndPt)) then
callback := GetCaptureControlCallback();
if callback <> nil then
begin
// do not send negative coordinates (unless dragging mouse)
Exit;
FIsEventRouting:=true;
Result := callback.MouseMove(Event);
FIsEventRouting:=false;
exit;
end
else
begin
rect:=Target.BoundsRect;
OffsetRect(rect, -rect.Left, -rect.Top);
if (event.type_ = NSMouseMoved) and (not Types.PtInRect(rect, bndPt)) then
begin
// do not send negative coordinates (unless dragging mouse)
Exit;
end;
if assigned(Target.Parent) and not Types.PtInRect(rect, bndPt) then
targetControl:=Target.Parent // outside myself then route to parent
else
for i:=Target.ControlCount-1 downto 0 do // otherwise check, if over child and route to child
if Target.Controls[i] is TWinControl then
begin
childControl:=TWinControl(Target.Controls[i]);
rect:=childControl.BoundsRect;
if Types.PtInRect(rect, clPt) and childControl.Visible and childControl.Enabled then
begin
targetControl:=childControl;
break;
end;
end;
end;
if assigned(Target.Parent) and not Types.PtInRect(rect, bndPt) then
targetControl:=Target.Parent // outside myself then route to parent
else
for i:=Target.ControlCount-1 downto 0 do // otherwise check, if over child and route to child
if Target.Controls[i] is TWinControl then
begin
childControl:=TWinControl(Target.Controls[i]);
rect:=childControl.BoundsRect;
if Types.PtInRect(rect, clPt) and childControl.Visible and childControl.Enabled then
begin
targetControl:=childControl;
break;
end;
end;
end;
if assigned(targetControl) and not FIsEventRouting then
begin
if not targetControl.HandleAllocated then Exit; // Fixes crash due to events being sent after ReleaseHandle
FIsEventRouting:=true;
//debugln(Target.name+' -> '+targetControl.Name+'- is parent:'+dbgs(targetControl=Target.Parent)+' Point: '+dbgs(br)+' Rect'+dbgs(rect));
obj := GetNSObjectView(NSObject(targetControl.Handle));
if obj = nil then Exit;
callback := obj.lclGetCallback;
if callback = nil then Exit; // Avoids crashes
result := callback.MouseMove(Event);
FIsEventRouting := false;
exit;
end;
if assigned(targetControl) and not FIsEventRouting then
begin
if not targetControl.HandleAllocated then Exit; // Fixes crash due to events being sent after ReleaseHandle
FIsEventRouting:=true;
//debugln(Target.name+' -> '+targetControl.Name+'- is parent:'+dbgs(targetControl=Target.Parent)+' Point: '+dbgs(br)+' Rect'+dbgs(rect));
obj := GetNSObjectView(NSObject(targetControl.Handle));
if obj = nil then Exit;
callback := obj.lclGetCallback;
if callback = nil then Exit; // Avoids crashes
result := callback.MouseMove(Event);
FIsEventRouting := false;
exit;
end;
if (Event.type_ = NSMouseMoved) and Owner.lclIsMouseInAuxArea(Event) then
begin
// mouse is over auxillary area that's "blind" to mouse moves
// even though the mouse cursos is within the control bounds.
// (i.e. scrollbars)
Result := false;
Exit;
if (Event.type_ = NSMouseMoved) and Owner.lclIsMouseInAuxArea(Event) then
begin
// mouse is over auxillary area that's "blind" to mouse moves
// even though the mouse cursos is within the control bounds.
// (i.e. scrollbars)
Result := false;
Exit;
end;
end;
// debugln('Send to: '+Target.name+' Point: '+dbgs(mp));