Changeset 228 for branches/xpascal/Packages/Common/FormEx.pas

Timestamp:

Jun 24, 2023, 12:33:35 PM (17 months ago)

Author:

chronos

Message:

• Modified: Use TFormEx for all forms.
• Modified: Test forms moved into Common package.

File:

• branches/xpascal/Packages/Common/FormEx.pas (modified) (5 diffs)

branches/xpascal/Packages/Common/FormEx.pas

@@ -11 +11 @@
 
   TFormEx = class(TForm)
+  private
+    FCounter: Integer; static;
+  public
     PersistentForm: TPersistentForm; static;
-    ThemeManager: TThemeManager;
-    Translator: TTranslator;
+    ThemeManager: TThemeManager; static;
+    Translator: TTranslator; static;
     procedure DoShow; override;
     procedure DoCreate; override;
@@ -27 +30 @@
 procedure Register;
 begin
-  RegisterClass(TFormEx);
+  RegisterNoIcon([TFormEx]);
 end;
 
@@ -34 +37 @@
 procedure TFormEx.DoShow;
 begin
+  inherited;
   PersistentForm.Load(Self);
-  inherited;
 end;
 
 procedure TFormEx.DoCreate;
 begin
-  inherited;
   if not Assigned(PersistentForm) then
     PersistentForm := TPersistentForm.Create(nil);
@@ -52 +54 @@
   Translator.TranslateComponentRecursive(Self);
   ThemeManager.UseTheme(Self);
+  Inc(FCounter);
+  inherited;
 end;
 
@@ -62 +66 @@
 procedure TFormEx.DoDestroy;
 begin
-  FreeAndNil(PersistentForm);
-  FreeAndNil(ThemeManager);
-  FreeAndNil(Translator);
+  Dec(FCounter);
+  if FCounter <= 0 then begin
+    FreeAndNil(PersistentForm);
+    FreeAndNil(ThemeManager);
+    FreeAndNil(Translator);
+  end;
   inherited;
 end;