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

lcl: forms: move the DesignTimeDPI and Scaled properties from TForm to TCustomDesignControl - TFrame needs it as well.

Browse Source 
git-svn-id: trunk@53622 -
This commit is contained in:
ondrej 2016-12-09 22:58:54 +00:00
parent 8a1c1ebeb1
commit c2e239e881
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lcl/forms.pp
View File

@ -252,7 +252,10 @@ type
end;
TCustomDesignControl = class(TScrollingWinControl)
protected
private const
DefaultScaled = {$IFDEF LCLScaleForms}True{$ELSE}False{$ENDIF};
private
FScaled: Boolean;
FDesignTimePPI: Integer;
FPixelsPerInch: Integer;
@ -264,8 +267,10 @@ type
public
constructor Create(TheOwner: TComponent); override;
public
property DesignTimeDPI: Integer read FDesignTimePPI write SetDesignTimePPI stored False; deprecated 'Use DesignTimePPI instead. DesignTimeDPI will be removed in 1.8';
property DesignTimePPI: Integer read FDesignTimePPI write SetDesignTimePPI default 96;
property PixelsPerInch: Integer read FPixelsPerInch write FPixelsPerInch stored False;
property Scaled: Boolean read FScaled write FScaled default DefaultScaled;
end;
@ -354,6 +359,7 @@ type
property ParentFont;
property ParentShowHint;
property PopupMenu;
property Scaled;
property ShowHint;
property TabOrder;
property TabStop;
@ -421,8 +427,6 @@ type
TCustomForm = class(TCustomDesignControl)
private const
DefaultScaled = {$IFDEF LCLScaleForms}True{$ELSE}False{$ENDIF};
private
FActive: Boolean;
FActiveControl: TWinControl;
@ -470,7 +474,6 @@ type
FRestoredHeight: integer;
FShowInTaskbar: TShowInTaskbar;
FWindowState: TWindowState;
FScaled: Boolean;
function GetClientHandle: HWND;
function GetEffectiveShowInTaskBar: TShowInTaskBar;
function GetMonitor: TMonitor;
@ -677,7 +680,6 @@ type
property DefaultMonitor: TDefaultMonitor read FDefaultMonitor
write FDefaultMonitor default dmActiveForm;
property Designer: TIDesigner read FDesigner write FDesigner;
property DesignTimeDPI: Integer read FDesignTimePPI write SetDesignTimePPI stored False; deprecated 'Use DesignTimePPI instead. DesignTimeDPI will be removed in 1.8';
property EffectiveShowInTaskBar: TShowInTaskBar read GetEffectiveShowInTaskBar;
property FormState: TFormState read FFormState;
property FormStyle: TFormStyle read FFormStyle write SetFormStyle
@ -714,7 +716,6 @@ type
property RestoredTop: integer read FRestoredTop;
property RestoredWidth: integer read FRestoredWidth;
property RestoredHeight: integer read FRestoredHeight;
property Scaled: Boolean read FScaled write FScaled default DefaultScaled;
property ShowInTaskBar: TShowInTaskbar read FShowInTaskbar write SetShowInTaskBar
default stDefault;
property Visible stored VisibleIsStored default false;

1
lcl/include/customdesigncontrol.inc
View File

@ -15,6 +15,7 @@ constructor TCustomDesignControl.Create(TheOwner: TComponent);
begin
inherited Create(TheOwner);
FScaled := DefaultScaled;
FDesignTimePPI := 96;
FPixelsPerInch := FDesignTimePPI;
end;

11
lcl/include/customform.inc
View File

@ -159,9 +159,9 @@ begin
EndFormUpdate; // the BeginFormUpdate is in CreateNew
inherited AfterConstruction;
if Scaled and (Screen.PixelsPerInch<>FPixelsPerInch) then
AutoAdjustLayout(lapAutoAdjustForDPI, FPixelsPerInch, Screen.PixelsPerInch,
Width, MulDiv(Width, Screen.PixelsPerInch, FPixelsPerInch), False);
if Scaled and (Screen.PixelsPerInch<>PixelsPerInch) then
AutoAdjustLayout(lapAutoAdjustForDPI, PixelsPerInch, Screen.PixelsPerInch,
Width, MulDiv(Width, Screen.PixelsPerInch, PixelsPerInch), False);
end;
{------------------------------------------------------------------------------
@ -2043,7 +2043,6 @@ begin
Include(FFormState,fsFirstShow);
//DebugLn('[TCustomForm.CreateNew] Class=',Classname);
BeginFormUpdate;
FScaled := DefaultScaled;
FLastFocusedControl := Self;
FBorderIcons := [biSystemMenu, biMinimize, biMaximize];
FDefaultMonitor := dmActiveForm;
@ -2243,8 +2242,8 @@ begin
begin
NewDpi := hi(Msg.wParam);
if Scaled and (NewDpi<>PixelsPerInch) then
AutoAdjustLayout(lapAutoAdjustForDPI, FPixelsPerInch, NewDpi,
Width, MulDiv(Width, NewDpi, FPixelsPerInch), True);
AutoAdjustLayout(lapAutoAdjustForDPI, PixelsPerInch, NewDpi,
Width, MulDiv(Width, NewDpi, PixelsPerInch), True);
end;
end;