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

Cocoa: Fix scroll bar init issue of the Form in TCocoaWSCustomForm.CreateHandle()

Browse Source 
1. in TCustomForm.ShowModal(), a modal form with pmNone may be destroyed and recreated by RecreateWnd().
2. in this case, some initialization data needs to be obtained from the Form, such as the setting data of ScrollBar.
3. for example, IDEOptionsDialog in Lazarus IDE.
This commit is contained in:
rich2014 2024-02-12 23:26:03 +08:00
parent e7b7b114a2
commit 2d1f1e0652
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,6 +199,9 @@ implementation
uses
GraphMath;
type
TControlScrollBarAccess = class(TControlScrollBar);
const
// The documentation is using constants like "NSNormalWindowLevel=4" for normal forms,
// however, these are macros of a function call to CGWindowLevelKey()
@ -701,6 +704,22 @@ begin
Result := TCocoaWindow(TCocoaWindow.alloc);
end;
function hasScrollBar(AScrollBar: TControlScrollBar): Boolean; inline;
begin
Result:= TControlScrollBarAccess(AScrollBar).ScrollBarShouldBeVisible;
end;
function hasHorzScrollBar(AWinControl: TWinControl): Boolean; inline;
begin
Result:= hasScrollBar( TScrollingWinControl(AWinControl).HorzScrollBar );
end;
function hasVertScrollBar(AWinControl: TWinControl): Boolean; inline;
begin
Result:= hasScrollBar( TScrollingWinControl(AWinControl).VertScrollBar );
end;
class function TCocoaWSCustomForm.CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): TLCLHandle;
var
@ -736,8 +755,8 @@ begin
cnt.wincallback := cb;
cnt.isCustomRange := true;
cnt.setHasHorizontalScroller(True);
cnt.setHasVerticalScroller(True);
cnt.setHasHorizontalScroller( hasHorzScrollBar(AWinControl) );
cnt.setHasVerticalScroller( hasVertScrollBar(AWinControl) );
cnt.setVerticalScrollElasticity(NSScrollElasticityNone);
cnt.setHorizontalScrollElasticity(NSScrollElasticityNone);
cnt.setDocumentView(doc);