paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-05 13:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

lcl, ide: set correct DesignTimePPI when creating a new form. Issue #31082

Browse Source 
git-svn-id: trunk@53598 -
This commit is contained in:
ondrej 2016-12-08 09:42:55 +00:00
parent 1b67af9431
commit 2d1d913087
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/sourcefilemanager.pas
View File

@ -4773,6 +4773,11 @@ begin
TControl(NewComponent).Caption:=NewComponent.Name; TControl(NewComponent).Caption:=NewComponent.Name;
NewUnitInfo.Component := NewComponent; NewUnitInfo.Component := NewComponent;
MainIDE.CreateDesignerForComponent(NewUnitInfo,NewComponent); MainIDE.CreateDesignerForComponent(NewUnitInfo,NewComponent);
if NewComponent is TCustomDesignControl then
begin
TCustomDesignControl(NewComponent).DesignTimePPI := Screen.PixelsPerInch;
TCustomDesignControl(NewComponent).PixelsPerInch := Screen.PixelsPerInch;
end;
NewUnitInfo.ComponentName:=NewComponent.Name; NewUnitInfo.ComponentName:=NewComponent.Name;
NewUnitInfo.ComponentResourceName:=NewUnitInfo.ComponentName; NewUnitInfo.ComponentResourceName:=NewUnitInfo.ComponentName;
@ -6168,9 +6173,6 @@ begin
Result:=LoadLFM(AnUnitInfo,LFMBuf,OpenFlags,CloseFlags); Result:=LoadLFM(AnUnitInfo,LFMBuf,OpenFlags,CloseFlags);
end; end;
type
TAccessCustomDesignControl = class(TCustomDesignControl);
function TLazSourceFileManager.LoadLFM(AnUnitInfo: TUnitInfo; LFMBuf: TCodeBuffer; function TLazSourceFileManager.LoadLFM(AnUnitInfo: TUnitInfo; LFMBuf: TCodeBuffer;
OpenFlags: TOpenFlags; CloseFlags: TCloseFlags): TModalResult; OpenFlags: TOpenFlags; CloseFlags: TCloseFlags): TModalResult;
const const
@ -6385,7 +6387,7 @@ begin
if DsgControl.DesignTimePPI<>Screen.PixelsPerInch then if DsgControl.DesignTimePPI<>Screen.PixelsPerInch then
begin begin
DsgControl.AutoAdjustLayout(lapAutoAdjustForDPI, DsgControl.DesignTimePPI, Screen.PixelsPerInch, 0, 0, False); DsgControl.AutoAdjustLayout(lapAutoAdjustForDPI, DsgControl.DesignTimePPI, Screen.PixelsPerInch, 0, 0, False);
TAccessCustomDesignControl(DsgControl).FDesignTimePPI := Screen.PixelsPerInch; DsgControl.DesignTimePPI := Screen.PixelsPerInch;
end; end;
end; end;

7
lcl/include/customdesigncontrol.inc
View File

@ -31,8 +31,13 @@ end;
procedure TCustomDesignControl.SetDesignTimePPI(const ADesignTimePPI: Integer); procedure TCustomDesignControl.SetDesignTimePPI(const ADesignTimePPI: Integer);
begin begin
if FDesignTimePPI=ADesignTimePPI then
Exit;
if (csLoading in ComponentState) // allow setting only when loading if (csLoading in ComponentState) // allow setting only when loading
or not (csDesigning in ComponentState) then // or in runtime (the programmer has to know why he is doing that) or not (csDesigning in ComponentState) // or in runtime (the programmer has to know why he is doing that)
or ((csDesigning in ComponentState) and (ADesignTimePPI=Screen.PixelsPerInch)) // or in designtime when setting the correct value
then
FDesignTimePPI := ADesignTimePPI FDesignTimePPI := ADesignTimePPI
else else
raise EInvalidOperation.Create(sCannotSetDesignTimePPI); raise EInvalidOperation.Create(sCannotSetDesignTimePPI);