paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-21 23:19:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: update the rule of selecting a parent view. all children should be added to lclContentView

Browse Source 
git-svn-id: trunk@57008 -
This commit is contained in:
dmitry 2018-01-08 03:28:54 +00:00
parent 350709605d
commit 30c34b43dc
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,6 +480,7 @@ type
TCocoaScrollView = objcclass(NSScrollView)
public
callback: ICommonCallback;
isCustomRange: Boolean;
function acceptsFirstResponder: Boolean; override;
function becomeFirstResponder: Boolean; override;
function resignFirstResponder: Boolean; override;
@ -487,6 +488,8 @@ type
procedure lclClearCallback; override;
procedure resetCursorRects; override;
function lclIsHandle: Boolean; override;
function lclClientFrame: TRect; override;
function lclContentView: NSView; override;
end;
{ TCocoaManualScrollView }
@ -1889,6 +1892,16 @@ begin
Result := True;
end;
function TCocoaScrollView.lclClientFrame: TRect;
begin
NSToLCLRect(contentView.frame, frame.size.height, Result);
end;
function TCocoaScrollView.lclContentView: NSView;
begin
Result:=documentView;
end;
function TCocoaScrollView.acceptsFirstResponder: Boolean;
begin
Result := True;
@ -2913,7 +2926,7 @@ begin
setHidden(AParams.Style and WS_VISIBLE = 0);
if Assigned(p) then
p.addSubview(Result);
p.lclContentView.addSubview(Result);
SetViewDefaults(Result);
end;