Changeset 266 for branches/highdpi/Packages/DpiControls/UDpiControls.pas

Timestamp:

Jun 26, 2020, 1:13:34 AM (4 years ago)

Author:

chronos

Message:

• Added: Application BeforeFinalization handler to free forms before finalization.

File:

• branches/highdpi/Packages/DpiControls/UDpiControls.pas (modified) (6 diffs)

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -812 +812 @@
     FMainForm: TDpiForm;
     FCreatingForm: TDpiForm;
+    FOldExitProc: Pointer;
     function GetActive: Boolean;
     function GetShowMainForm: Boolean;
@@ -821 +822 @@
   protected
     function GetNativeApplication: TApplication; virtual;
+    procedure DoBeforeFinalization;
   public
     constructor Create(AOwner: TComponent); override;
@@ -1594 +1596 @@
 end;
 
+procedure DpiBeforeFinalization;
+// This is our ExitProc handler.
+begin
+  DpiApplication.DoBeforeFinalization;
+end;
+
+procedure TDpiApplication.DoBeforeFinalization;
+var
+  i: Integer;
+  C: TComponent;
+begin
+  if Self = nil then Exit;
+  for i := ComponentCount - 1 downto 0 do begin
+    if i < ComponentCount then begin
+      C := Components[i];
+      // C.Name
+      C.Free;
+    end;
+  end;
+end;
+
 function DpiFindApplicationComponent(const ComponentName: string): TComponent;
 // Note: this function is used by TReader to auto rename forms to unique names.
@@ -1603 +1626 @@
 begin
   RegisterFindGlobalComponentProc(@DpiFindApplicationComponent);
+  FOldExitProc := ExitProc;
+  ExitProc := @DpiBeforeFinalization;
   inherited;
 end;
@@ -1608 +1633 @@
 destructor TDpiApplication.Destroy;
 begin
+  ExitProc := FOldExitProc;
   inherited Destroy;
 end;
@@ -3736 +3762 @@
 destructor TDpiForm.Destroy;
 begin
+  // Name
   // TODO: Can't destroy directly?
   //FreeAndNil(NativeForm);
+
+  TFormEx(NativeForm).OnMessage := nil;
   DpiScreen.RemoveForm(Self);
 end;