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

LCL: HighDPI: use relative font scaling, not the absolute PPI (fix for r54210 #eb28e06e83). Issue

Browse Source 
git-svn-id: trunk@54211 -
This commit is contained in:
ondrej 2017-02-20 15:04:02 +00:00
parent eb28e06e83
commit 592b495a47
12 changed files with 22 additions and 22 deletions

6
lcl/comctrls.pp
View File

@ -159,7 +159,7 @@ type
procedure LMDrawItem(var Message: TLMDrawItems); message LM_DRAWITEM;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer); override;
const AXProportion, AYProportion: Double); override;
public
constructor Create(TheOwner: TComponent); override;
destructor Destroy; override;
@ -1490,7 +1490,7 @@ type
procedure DoItemChecked(AItem: TListItem);
procedure DoSelectItem(AItem: TListItem; ASelected: Boolean); virtual;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer); override;
const AXProportion, AYProportion: Double); override;
procedure DoSetBounds(ALeft, ATop, AWidth, AHeight: integer); override;
procedure DoEndEdit(AItem: TListItem; const AValue: String); virtual;
@ -2252,7 +2252,7 @@ type
Simulate: boolean): Boolean;
procedure CNDropDownClosed(var Message: TLMessage); message CN_DROPDOWNCLOSED;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer); override;
const AXProportion, AYProportion: Double); override;
public
constructor Create(TheOwner: TComponent); override;
destructor Destroy; override;

2
lcl/controls.pp
View File

@ -1419,7 +1419,7 @@ type
class function GetControlClassDefaultSize: TSize; virtual;
function ColorIsStored: boolean; virtual;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer); virtual;
const AXProportion, AYProportion: Double); virtual;
class procedure DoFixDesignFontPPI(const AFont: TFont; const ADesignTimePPI: Integer);
protected
// actions

2
lcl/forms.pp
View File

@ -549,7 +549,7 @@ type
procedure CreateWnd; override;
procedure Deactivate; virtual;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer); override;
const AXProportion, AYProportion: Double); override;
procedure DoClose(var CloseAction: TCloseAction); virtual;
procedure DoCreate; virtual;
procedure DoDestroy; virtual;

4
lcl/grids.pas
View File

@ -960,7 +960,7 @@ type
function DoMouseWheelDown(Shift: TShiftState; MousePos: TPoint): Boolean; override;
function DoMouseWheelUp(Shift: TShiftState; MousePos: TPoint): Boolean; override;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer); override;
const AXProportion, AYProportion: Double); override;
procedure DoOnChangeBounds; override;
procedure DoOPDeleteColRow(IsColumn: Boolean; index: Integer);
procedure DoOPExchangeColRow(IsColumn: Boolean; index, WithIndex: Integer);
@ -6749,7 +6749,7 @@ begin
end;
procedure TCustomGrid.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer);
const AXProportion, AYProportion: Double);
var
i: Integer;
C: TGridColumn;

6
lcl/groupededit.pp
View File

@ -179,7 +179,7 @@ type
procedure SetTextHint(AValue: TTranslateString);
protected
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer); override;
const AXProportion, AYProportion: Double); override;
procedure CalculatePreferredSize(var PreferredWidth, PreferredHeight: integer;
WithThemeSpace: Boolean); override;
function CreateBuddy: TControl; virtual;
@ -1246,8 +1246,8 @@ begin
end;
procedure TCustomAbstractGroupedEdit.DoAutoAdjustLayout(
const AMode: TLayoutAdjustmentPolicy; const AXProportion,
AYProportion: Double; const AToDPI: Integer);
const AMode: TLayoutAdjustmentPolicy; const AXProportion, AYProportion: Double
);
begin
inherited;

6
lcl/include/control.inc
View File

@ -2976,13 +2976,13 @@ begin
end;
procedure TControl.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer);
const AXProportion, AYProportion: Double);
var
AAWidth, AAHeight: Boolean;
NewLeft, NewTop, NewWidth, NewHeight, NewRight, NewBottom, OldWidth, OldHeight: Integer;
begin
if not ParentFont or (Parent=nil) then
Font.PixelsPerInch := AToDPI;
Font.PixelsPerInch := Round(Font.PixelsPerInch*AYProportion);
// Apply the changes
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
@ -4008,7 +4008,7 @@ begin
if AFromDPI > 0 then lYProportion := AToDPI / AFromDPI
else lYProportion := 1.0;
DoAutoAdjustLayout(lMode, lXProportion, lYProportion, AToDPI);
DoAutoAdjustLayout(lMode, lXProportion, lYProportion);
end;
// Auto-adjust the layout of controls.

4
lcl/include/customform.inc
View File

@ -1568,7 +1568,7 @@ begin
end;
procedure TCustomForm.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer);
const AXProportion, AYProportion: Double);
var
NewWidth, NewHeight, OldWidth, OldHeight: Integer;
begin
@ -1579,7 +1579,7 @@ begin
end;
if not ParentFont or (Parent=nil) then
Font.PixelsPerInch := AToDPI;
Font.PixelsPerInch := Round(Font.PixelsPerInch*AYProportion);
// Apply the changes
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then

4
lcl/include/customlistbox.inc
View File

@ -470,8 +470,8 @@ begin
end;
procedure TCustomListBox.DoAutoAdjustLayout(
const AMode: TLayoutAdjustmentPolicy; const AXProportion,
AYProportion: Double; const AToDPI: Integer);
const AMode: TLayoutAdjustmentPolicy; const AXProportion, AYProportion: Double
);
begin
inherited;

4
lcl/include/customlistview.inc
View File

@ -612,8 +612,8 @@ begin
end;
procedure TCustomListView.DoAutoAdjustLayout(
const AMode: TLayoutAdjustmentPolicy; const AXProportion,
AYProportion: Double; const AToDPI: Integer);
const AMode: TLayoutAdjustmentPolicy; const AXProportion, AYProportion: Double
);
var
i: Integer;
C: TListColumn;

2
lcl/include/statusbar.inc
View File

@ -148,7 +148,7 @@ begin
end;
procedure TStatusBar.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer);
const AXProportion, AYProportion: Double);
var
I: Integer;
begin

2
lcl/include/toolbar.inc
View File

@ -342,7 +342,7 @@ begin
end;
procedure TToolBar.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer);
const AXProportion, AYProportion: Double);
begin
inherited;

2
lcl/stdctrls.pp
View File

@ -551,7 +551,7 @@ type
procedure SetStyle(Val: TListBoxStyle); virtual;
procedure DrawItem(Index: Integer; ARect: TRect; State: TOwnerDrawState); virtual;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AToDPI: Integer); override;
const AXProportion, AYProportion: Double); override;
procedure DoSelectionChange(User: Boolean); virtual;
procedure SendItemIndex;
public