Changeset 214 for branches

Timestamp:

May 9, 2020, 11:49:48 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Wrong TDpiForm property type.
• Fixed: Fonts were not correctly applied to controls.

Location:

branches/highdpi

Files:

• Integrated.lpi (modified) (1 diff)
• Packages/DpiControls/UDpiControls.pas (modified) (6 diffs)

branches/highdpi/Integrated.lpi

@@ -16 +16 @@
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True"/>
+      </XPManifest>
       <Icon Value="0"/>
       <Resources Count="2">

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -437 +437 @@
     FOnDeactivate: TNotifyEvent;
     function GetBorderIcons: TBorderIcons;
-    function GetBorderStyle: TBorderStyle;
+    function GetBorderStyle: TFormBorderStyle;
     function GetDesignTimePPI: Integer;
     function GetFormState: TFormState;
@@ -454 +454 @@
     function GetWindowState: TWindowState;
     procedure SetBorderIcons(AValue: TBorderIcons);
-    procedure SetBorderStyle(AValue: TBorderStyle);
+    procedure SetBorderStyle(AValue: TFormBorderStyle);
     procedure SetDesignTimePPI(AValue: Integer);
     procedure SetFormStyle(AValue: TFormStyle);
@@ -493 +493 @@
     property FormState: TFormState read GetFormState;
     property FormStyle: TFormStyle read GetFormStyle write SetFormStyle;
-    property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle;
+    property BorderStyle: TFormBorderStyle read GetBorderStyle write SetBorderStyle default bsSizeable;
     property BorderIcons: TBorderIcons read GetBorderIcons write SetBorderIcons;
     property LCLVersion: string read GetLCLVersion write SetLCLVersion;
@@ -2231 +2231 @@
 procedure TDpiControl.UpdateVclControl;
 begin
+  Font.VclFont := GetVclControl.Font;
   GetVclControl.OnResize := @VclFormResize;
   GetVclControl.OnChangeBounds := @VclChangeBounds;
@@ -2636 +2637 @@
 end;
 
-function TDpiForm.GetBorderStyle: TBorderStyle;
+function TDpiForm.GetBorderStyle: TFormBorderStyle;
 begin
   Result := GetVclForm.BorderStyle;
@@ -2721 +2722 @@
 end;
 
-procedure TDpiForm.SetBorderStyle(AValue: TBorderStyle);
+procedure TDpiForm.SetBorderStyle(AValue: TFormBorderStyle);
 begin
   GetVclForm.BorderStyle := AValue;