* Fixed the save and restore form state in the UI Designer, which broke after I changed the behaviour of AfterCreate method.

2 files changed, 38 insertions, 59 deletions

diff --git a/examples/apps/uidesigner/newformdesigner.pas b/examples/apps/uidesigner/newformdesigner.pas
index 6cd7e687..5fb1701a 100644
--- a/examples/apps/uidesigner/newformdesigner.pas
+++ b/examples/apps/uidesigner/newformdesigner.pas
@@ -75,11 +75,10 @@ type
     previewmenu: TfpgPopupMenu;
     {@VFD_HEAD_END: frmMain}
     mru: TfpgMRU;
-    constructor Create(AOwner: TComponent); override;
-    destructor  Destroy; override;
     function    GetSelectedWidget: TVFDWidgetClass;
     procedure   SetSelectedWidget(wgc: TVFDWidgetClass);
     procedure   AfterCreate; override;
+    procedure   BeforeDestruction; override;
     procedure   OnPaletteClick(Sender: TObject);
     property    SelectedWidget: TVFDWidgetClass read GetSelectedWidget write SetSelectedWidget;
   end;
@@ -138,9 +137,8 @@ type
     btnTop, btnLeft, btnWidth, btnHeight: TfpgButton;
     btnAnLeft, btnAnTop, btnAnRight, btnAnBottom: TfpgButton;
     lstProps: TwgPropertyList;
-    constructor Create(AOwner: TComponent); override;
-    destructor  Destroy; override;
     procedure   AfterCreate; override;
+    procedure   BeforeDestruction; override;
   end;
 
 
@@ -281,6 +279,7 @@ begin
   SetPosition(84, 123, 695, 87);
   WindowTitle := 'frmMain';
   WindowPosition := wpUser;
+  gINI.ReadFormState(self);
 
   MainMenu := TfpgMenuBar.Create(self);
   with MainMenu do
@@ -448,6 +447,12 @@ begin
   mru.LoadMRU;
 end;
 
+procedure TfrmMain.BeforeDestruction;
+begin
+  gINI.WriteFormState(self);
+  inherited BeforeDestruction;
+end;
+
 procedure TfrmMain.OnPaletteClick(Sender: TObject);
 var
   s: string;
@@ -471,6 +476,11 @@ var
   x, x2, w, y, gap: integer;
 begin
   inherited;
+  Name := 'frmProperties';
+  WindowPosition := wpUser;
+  WindowTitle := 'Properties';
+  SetPosition(43, 150, 250, 450);
+  gINI.ReadFormState(self);
 
   fpgImages.AddMaskedBMP(
     'vfd.anchorleft', @vfd_anchorleft,
@@ -488,16 +498,11 @@ begin
     'vfd.anchorbottom', @vfd_anchorbottom,
     sizeof(vfd_anchorbottom), 0, 0);
 
-
-  WindowPosition := wpUser;
-  WindowTitle := 'Properties';
-  SetPosition(43, 150, 250, 450);
-
-  x   := 3;
-  x2  := x + 50;
-  gap := 20;
-  w := Width - x2;
-  y := 3;
+  x     := 3;
+  x2    := x + 50;
+  gap   := 20;
+  w     := Width - x2;
+  y     := 3;
 
   l1      := CreateLabel(self, 0, y, 'Class:');
   lbClass := CreateLabel(self, x2, y, 'CLASS');
@@ -632,6 +637,12 @@ begin
   edOther.OnChange := @(maindsgn.OnOtherChange);
 end;
 
+procedure TfrmProperties.BeforeDestruction;
+begin
+  gINI.WriteFormState(self);
+  inherited BeforeDestruction;
+end;
+
 procedure TfrmProperties.HandleKeyPress(var keycode: word; var shiftstate: TShiftState; var consumed: boolean);
 begin
   if keycode = keyF11 then
@@ -642,22 +653,8 @@ begin
       maindsgn.selectedform.Form.ActivateWindow;
     end;
     consumed := True;
-  end
-  else
-    inherited;
-end;
-
-constructor TfrmProperties.Create(AOwner: TComponent);
-begin
-  inherited Create(AOwner);
-  Name := 'frmProperties';
-  gINI.ReadFormState(self);
-end;
-
-destructor TfrmProperties.Destroy;
-begin
-  gINI.WriteFormState(self);
-  inherited Destroy;
+  end;
+  inherited;
 end;
 
 { TPropertyList }
@@ -859,19 +856,6 @@ begin
   maindsgn.OnLoadFile(maindsgn);
 end;
 
-constructor TfrmMain.Create(AOwner: TComponent);
-begin
-  inherited Create(AOwner);
-  Name := 'frmMain';
-  gINI.ReadFormState(self);
-end;
-
-destructor TfrmMain.Destroy;
-begin
-  gINI.WriteFormState(self);
-  inherited Destroy;
-end;
-
 function TfrmMain.GetSelectedWidget: TVFDWidgetClass;
 begin
   if chlPalette.FocusItem > 0 then
diff --git a/examples/apps/uidesigner/vfdforms.pas b/examples/apps/uidesigner/vfdforms.pas
index 5748dfd7..c7407a84 100644
--- a/examples/apps/uidesigner/vfdforms.pas
+++ b/examples/apps/uidesigner/vfdforms.pas
@@ -118,9 +118,8 @@ type
     lblName1: TfpgLabel;
     lblName2: TfpgLabel;
     {@VFD_HEAD_END: frmVFDSetup}
-    constructor Create(AOwner: TComponent); override;
-    destructor  Destroy; override;
     procedure   AfterCreate; override;
+    procedure   BeforeDestruction; override;
   end;
 
 
@@ -422,26 +421,14 @@ begin
   ModalResult := 1;
 end;
 
-constructor TfrmVFDSetup.Create(AOwner: TComponent);
-begin
-  inherited Create(AOwner);
-  Name := 'frmVFDSetup';
-  gINI.ReadFormState(self);
-  LoadSettings;
-end;
-
-destructor TfrmVFDSetup.Destroy;
-begin
-  gINI.WriteFormState(self);
-  inherited Destroy;
-end;
-
 procedure TfrmVFDSetup.AfterCreate;
 begin
   {@VFD_BODY_BEGIN: frmVFDSetup}
+  Name := 'frmVFDSetup';
   SetPosition(394, 399, 252, 184);
   WindowTitle := 'General settings';
   WindowPosition := wpScreenCenter;
+  gINI.ReadFormState(self);
 
   lb1 := TfpgLabel.Create(self);
   with lb1 do
@@ -531,6 +518,14 @@ begin
   end;
 
   {@VFD_BODY_END: frmVFDSetup}
+
+  LoadSettings;
+end;
+
+procedure TfrmVFDSetup.BeforeDestruction;
+begin
+  gINI.WriteFormState(self);
+  inherited BeforeDestruction;
 end;