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

cocoa: adding support for TMemo alignment and background color. #32796

Browse Source 
git-svn-id: trunk@56877 -
This commit is contained in:
dmitry 2017-12-30 17:50:36 +00:00
parent 04f1929c96
commit a67f8825a2
2 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -914,6 +914,14 @@ function GetNSViewSuperViewHeight(view: NSView): CGFloat;
procedure SetNSControlSize(ctrl: NSControl; newHeight, miniHeight, smallHeight: Integer; AutoChangeFont: Boolean);
// these constants are missing from CocoaAll for some reason
const
NSTextAlignmentLeft = 0;
NSTextAlignmentRight = 1; // it's 2 for iOS and family
NSTextAlignmentCenter = 2; // it's 1 for iOS and family
NSTextAlignmentJustified = 3;
NSTextAlignmentNatural = 4;
implementation
uses CocoaWSComCtrls, CocoaInt;

46
lcl/interfaces/cocoa/cocoawsstdctrls.pp
View File

@ -164,11 +164,17 @@ type
class function GetScrollView(AWinControl: TWinControl): TCocoaScrollView;
published
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
// WSControl functions
class procedure SetColor(const AWinControl: TWinControl); override;
// WSEdit functions
//class function GetCanUndo(const ACustomEdit: TCustomEdit): Boolean; override;
class function GetCaretPos(const ACustomEdit: TCustomEdit): TPoint; override;
class function GetSelStart(const ACustomEdit: TCustomEdit): integer; override;
class function GetSelLength(const ACustomEdit: TCustomEdit): integer; override;
class procedure SetAlignment(const ACustomEdit: TCustomEdit; const NewAlignment: TAlignment); override;
// WSMemo functions
class function GetStrings(const ACustomMemo: TCustomMemo): TStrings; override;
class procedure AppendText(const ACustomMemo: TCustomMemo; const AText: string); override;
@ -269,6 +275,8 @@ function GetListBox(AWinControl: TWinControl): TCocoaListBox;
procedure ListBoxSetStyle(list: TCocoaListBox; AStyle: TListBoxStyle);
procedure TextViewSetWordWrap(txt: NSTextView; lScroll: NSScrollView; NewWordWrap: Boolean);
function AlignmentLCLToCocoa(al: TAlignment): NSTextAlignment;
procedure TextViewSetAllignment(txt: NSTextView; align: TAlignment);
implementation
@ -935,6 +943,24 @@ begin
txt.sizeToFit;
end;
function AlignmentLCLToCocoa(al: TAlignment): NSTextAlignment;
begin
case al of
taRightJustify:
Result := NSTextAlignmentRight;
taCenter:
Result := NSTextAlignmentCenter;
else
Result:= NSTextAlignmentLeft;
end;
end;
procedure TextViewSetAllignment(txt: NSTextView; align: TAlignment);
begin
//todo: for bidi modes, there's "NSTextAlignmentNatural"
txt.setAlignment( AlignmentLCLToCocoa(align) );
end;
class function TCocoaWSCustomMemo.GetTextView(AWinControl: TWinControl): TCocoaTextView;
var
lScroll: TCocoaScrollView;
@ -1011,9 +1037,19 @@ begin
scr.callback := txt.callback;
TextViewSetWordWrap(txt, scr, TCustomMemo(AWinControl).WordWrap);
TextViewSetAllignment(txt, TCustomMemo(AWinControl).Alignment);
Result := TLCLIntfHandle(scr);
end;
class procedure TCocoaWSCustomMemo.SetColor(const AWinControl: TWinControl);
var
txt: TCocoaTextView;
begin
txt := GetTextView(AWinControl);
if not Assigned(txt) then Exit;
txt.setBackgroundColor( ColorToNSColor(AWinControl.Color));
end;
class function TCocoaWSCustomMemo.GetCaretPos(const ACustomEdit: TCustomEdit): TPoint;
var
txt: TCocoaTextView;
@ -1075,6 +1111,16 @@ begin
Result := txt.selectedRange.length;
end;
class procedure TCocoaWSCustomMemo.SetAlignment(const ACustomEdit: TCustomEdit;
const NewAlignment: TAlignment);
var
txt: TCocoaTextView;
begin
txt := GetTextView(ACustomEdit);
if Assigned(txt) then
TextViewSetAllignment(txt, NewAlignment);
end;
class function TCocoaWSCustomMemo.GetStrings(const ACustomMemo: TCustomMemo): TStrings;
var
txt: TCocoaTextView;