paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-14 14:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: check the processing event flag returned from callback object on MouseDown for CocoaListBox and CocoaTextView. (revert of previous patches in #30297 and #30131)

Browse Source 
git-svn-id: trunk@57085 -
This commit is contained in:
dmitry 2018-01-14 06:54:15 +00:00
parent 7b2be45ba9
commit 48ff0f78f8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2563,14 +2563,17 @@ end;
procedure TCocoaTextView.mouseDown(event: NSEvent); procedure TCocoaTextView.mouseDown(event: NSEvent);
begin begin
inherited mouseDown(event); if Assigned(callback) then
if callback <> nil then
begin begin
callback.MouseUpDownEvent(event); if not callback.MouseUpDownEvent(event) then
inherited mouseDown(event);
// Cocoa doesn't call mouseUp for NSTextView, so we have to emulate it here :( // Cocoa doesn't call mouseUp for NSTextView, so we have to emulate it here :(
// See bug 29000 // See bug 29000
if Assigned(callback) then
callback.MouseUpDownEvent(event, True); callback.MouseUpDownEvent(event, True);
end; end else
inherited mouseDown(event);
end; end;
procedure TCocoaTextView.mouseUp(event: NSEvent); procedure TCocoaTextView.mouseUp(event: NSEvent);
@ -3518,8 +3521,7 @@ end;
procedure TCocoaListBox.mouseDown(event: NSEvent); procedure TCocoaListBox.mouseDown(event: NSEvent);
begin begin
if Assigned(callback) then callback.MouseUpDownEvent(event); if Assigned(callback) and not callback.MouseUpDownEvent(event) then
// Always call inherited, otherwise clicking stops working, see bug 30297
inherited mouseDown(event); inherited mouseDown(event);
end; end;