paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-04 09:40:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: simplify GetCanvasScaleFactor

Browse Source 
git-svn-id: trunk@57244 -
This commit is contained in:
ondrej 2018-02-04 00:53:25 +00:00
parent 2801ad9f1c
commit 8ec39ecc46
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/interfaces/cocoa/cocoawscommon.pas
View File

@ -98,6 +98,7 @@ type
class function CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): TLCLIntfHandle; override;
class procedure DestroyHandle(const AWinControl: TWinControl); override;
class function GetCanvasScaleFactor(const AControl: TControl): Double; override;
class procedure SetText(const AWinControl: TWinControl; const AText: String); override;
class function GetText(const AWinControl: TWinControl; var AText: String): Boolean; override;
class function GetTextLen(const AWinControl: TWinControl; var ALength: Integer): Boolean; override;
@ -1280,14 +1281,11 @@ end;
class function TCocoaWSControl.GetCanvasScaleFactor(const AControl: TControl
): Double;
var
Form: TCustomForm;
begin
Form := GetParentForm(AControl);
if Form=nil then
Result := 1
if Assigned(AControl.Parent) then
Result := TWSControlClass(AControl.Parent.WidgetSetClass).GetCanvasScaleFactor(AControl.Parent)
else
Result := TCocoaWindow(Form.Handle).backingScaleFactor; // ToDo: use userSpaceScaleFactor for Mac OSX 10.6
Result := 1;
end;
{ TCocoaWSWinControl }
@ -1364,6 +1362,15 @@ begin
obj.release;
end;
class function TCocoaWSWinControl.GetCanvasScaleFactor(const AControl: TControl
): Double;
begin
if TWinControl(AControl).HandleAllocated then
Result := TCocoaWindow(TWinControl(AControl).Handle).backingScaleFactor // ToDo: use userSpaceScaleFactor for Mac OSX 10.6
else
Result := 1;
end;
class procedure TCocoaWSWinControl.SetText(const AWinControl: TWinControl; const AText: String);
var
obj: NSObject;