Changeset 29

Timestamp:

Jun 4, 2010, 7:10:40 AM (14 years ago)

Author:

george

Message:

• Opraveno: PersistentForm špatně obnovoval velikost formuláře v normálním stavu okna.

File:

• PersistentForm/UPersistentForm.pas (modified) (2 diffs)

PersistentForm/UPersistentForm.pas

@@ -48 +48 @@
       if Form.Top > (Screen.Height - 50) then
         Form.Top := Screen.Height - 50;
-      RestoredWidth := ReadIntegerWithDefault('RestoredWidth', Form.RestoredWidth);
-      RestoredHeight := ReadIntegerWithDefault ('RestoredHeight', Form.RestoredHeight);
-      RestoredTop := ReadIntegerWithDefault ('RestoredTop', (Screen.Height - Form.RestoredHeight) div 2);
-      RestoredLeft := ReadIntegerWithDefault ('RestoredLeft', (Screen.Width - Form.RestoredWidth) div 2);
-      Form.SetRestoredBounds(RestoredLeft, RestoredTop, RestoredWidth, RestoredHeight);
+      Form.WindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
+      if Form.WindowState = wsMaximized then begin
+        RestoredWidth := ReadIntegerWithDefault('RestoredWidth', Form.RestoredWidth);
+        RestoredHeight := ReadIntegerWithDefault ('RestoredHeight', Form.RestoredHeight);
+        RestoredTop := ReadIntegerWithDefault ('RestoredTop', (Screen.Height - Form.RestoredHeight) div 2);
+        RestoredLeft := ReadIntegerWithDefault ('RestoredLeft', (Screen.Width - Form.RestoredWidth) div 2);
+        Form.SetRestoredBounds(RestoredLeft, RestoredTop, RestoredWidth, RestoredHeight);
+      end;
 
-      Form.WindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
       if ReadBoolWithDefault('Visible', False) then Form.Show;
     finally
@@ -71 +73 @@
       WriteInteger('Top', Form.Top);
       WriteInteger('Left', Form.Left);
+      WriteInteger('WindowState', Integer(Form.WindowState));
       WriteInteger('RestoredWidth', Form.RestoredWidth);
       WriteInteger('RestoredHeight', Form.RestoredHeight);
       WriteInteger('RestoredTop', Form.RestoredTop);
       WriteInteger('RestoredLeft', Form.RestoredLeft);
-      WriteInteger('WindowState', Integer(Form.WindowState));
       WriteBool('Visible', Form.Visible);
     finally