paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 11:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: Fix Document size in TCocoaScrollView

Browse Source 
in the previous implementation, the entire frame of ScrollView was mistakenly used instead of Client Bound.
This commit is contained in:
rich2014 2024-02-11 21:09:49 +08:00
parent c00f60ad39
commit ab4727c101
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/cocoa/cocoawinapi.inc
View File

@ -1718,7 +1718,7 @@ begin
begin
sc:=TCocoaScrollView(obj);
if sc.isCustomRange and (ScrollInfo.fMask and SIF_RANGE>0) then begin
f:=sc.frame.size;
f:=sc.contentSize;
sz:=NSView(sc.documentView).frame.size; // type casting is here for the compiler. for i386 it messes up types
flg:=sc.documentView.autoresizingMask;

14
lcl/interfaces/cocoa/cocoawsforms.pas
View File

@ -535,21 +535,25 @@ var
docview: TCocoaCustomControl;
lcl : TLCLCommonCallback;
begin
docview := TCocoaCustomControl.alloc.lclInitWithCreateParams(AParams);
scrollcon:=EmbedInScrollView(docView);
scrollcon:= TCocoaScrollView.alloc.lclInitWithCreateParams(AParams);
ScrollViewSetBorderStyle(scrollcon, TScrollingWinControl(AWincontrol).BorderStyle);
scrollcon.setDrawsBackground(false); // everything is covered anyway
scrollcon.setBackgroundColor(NSColor.windowBackgroundColor);
scrollcon.setAutohidesScrollers(True);
scrollcon.setHasHorizontalScroller(True);
scrollcon.setHasVerticalScroller(True);
scrollcon.isCustomRange := true;
docview:= TCocoaCustomControl.alloc.init;
docview.setFrameSize( scrollcon.contentSize );
scrollcon.setDocumentView(docview);
lcl := TLCLCommonCallback.Create(docview, AWinControl, scrollcon);
lcl.BlockCocoaUpDown := true;
scrollcon.callback := lcl;
docview.callback := lcl;
docview.setAutoresizingMask(NSViewWidthSizable or NSViewHeightSizable);
scrollcon.callback := lcl;
scrollcon.setDocumentView(docview);
ScrollViewSetBorderStyle(scrollcon, TScrollingWinControl(AWincontrol).BorderStyle);
Result := TLCLHandle(scrollcon);
end;