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

Cocoa: Fix #40531: Alignment of TStaticText supported, Merge branch 'cocoa/statictext'

Browse Source
This commit is contained in:
rich2014 2023-10-01 20:18:13 +08:00
parent bb816b0e8c
commit e4e5f327b2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/interfaces/cocoa/cocoawsstdctrls.pas
View File

@ -342,7 +342,7 @@ type
protected
published
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
// class procedure SetAlignment(const ACustomStaticText: TCustomStaticText; const NewAlignment: TAlignment); override;
class procedure SetAlignment(const ACustomStaticText: TCustomStaticText; const NewAlignment: TAlignment); override;
end;
function AllocTextView(ATarget: TWinControl; const AParams: TCreateParams; fieldEditor: Boolean): NSTextView;
@ -1008,6 +1008,7 @@ end;
class function TCocoaWSCustomStaticText.CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): TLCLIntfHandle;
var
lclStaticText: TCustomStaticText absolute AWinControl;
field: NSTextField;
begin
field := NSTextField(AllocTextField(AWinControl, AParams));
@ -1022,9 +1023,18 @@ begin
field.setEditable(False);
field.setSelectable(False);
{$endif}
field.setAlignment( AlignmentLCLToCocoa(lclStaticText.Alignment) );
Result:=TLCLIntfHandle(field);
end;
class procedure TCocoaWSCustomStaticText.SetAlignment(
const ACustomStaticText: TCustomStaticText; const NewAlignment: TAlignment);
begin
if not Assigned(ACustomStaticText) or (not ACustomStaticText.HandleAllocated) or (ACustomStaticText.Handle=0) then
exit;
NSTextField(ACustomStaticText.Handle).setAlignment( AlignmentLCLToCocoa(NewAlignment) );
end;
{ TCocoaWSCustomEdit }
class function TCocoaWSCustomEdit.GetTextField(AWinControl: TWinControl): TCocoaTextField;