Changeset 81 for trunk

Timestamp:

Jun 21, 2017, 4:02:31 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Show main form as maximized by default on first start.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (14 diffs)
• Forms/UFormMain.pas (modified) (1 diff)
• LazFuck.lpi (modified) (1 diff)
• LazFuck.res (modified) ( previous)
• Packages/Common/UPersistentForm.pas (modified) (5 diffs)
• UCore.pas (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 860
   Caption = 'LazFuck'
-  ClientHeight = 554
+  ClientHeight = 561
   ClientWidth = 860
   Menu = MainMenu1
@@ -13 +13 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.4.0'
   WindowState = wsMaximized
   object StatusBarMain: TStatusBar
     Left = 0
     Height = 28
-    Top = 526
+    Top = 533
     Width = 860
     Panels = <    
@@ -131 +131 @@
   object PageControlRight: TPageControl
     Left = 467
-    Height = 500
+    Height = 507
     Top = 26
     Width = 393
@@ -141 +141 @@
     object TabSheetDebug: TTabSheet
       Caption = 'Debug'
-      ClientHeight = 494
-      ClientWidth = 319
+      ClientHeight = 499
+      ClientWidth = 359
       object PanelInput: TPanel
         Left = 0
         Height = 64
         Top = 0
-        Width = 319
+        Width = 359
         Align = alTop
         BevelOuter = bvNone
@@ -157 +157 @@
         Height = 5
         Top = 64
-        Width = 319
+        Width = 359
         Align = alTop
         ResizeAnchor = akTop
@@ -165 +165 @@
         Height = 259
         Top = 69
-        Width = 319
+        Width = 359
         Align = alTop
         BevelOuter = bvNone
@@ -175 +175 @@
         Height = 5
         Top = 328
-        Width = 319
+        Width = 359
         Align = alTop
         ResizeAnchor = akTop
@@ -183 +183 @@
         Height = 86
         Top = 333
-        Width = 319
+        Width = 359
         Align = alTop
         BevelOuter = bvNone
@@ -193 +193 @@
         Height = 5
         Top = 419
-        Width = 319
+        Width = 359
         Align = alTop
         ResizeAnchor = akTop
@@ -199 +199 @@
       object PanelMemory: TPanel
         Left = 0
-        Height = 70
+        Height = 75
         Top = 424
-        Width = 319
+        Width = 359
         Align = alClient
         BevelOuter = bvNone
@@ -210 +210 @@
   object Splitter1: TSplitter
     Left = 462
-    Height = 500
+    Height = 507
     Top = 26
     Width = 5
@@ -218 +218 @@
   object PanelLeft: TPanel
     Left = 0
-    Height = 500
+    Height = 507
     Top = 26
     Width = 462
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 500
+    ClientHeight = 507
     ClientWidth = 462
     TabOrder = 4
     object PageControlMain: TPageControl
       Left = 0
-      Height = 377
+      Height = 384
       Top = 0
       Width = 462
@@ -246 +246 @@
       Left = 0
       Height = 118
-      Top = 382
+      Top = 389
       Width = 462
       ActivePage = TabSheetMessages
@@ -261 +261 @@
       Left = 0
       Height = 5
-      Top = 377
+      Top = 384
       Width = 462
       Align = alBottom

trunk/Forms/UFormMain.pas

@@ -207 +207 @@
   UpdateTargetList;
   DockInit;
-  Core.PersistentForm1.Load(Self);
+  Core.PersistentForm1.Load(Self, wsMaximized);
 end;
 

trunk/LazFuck.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <PathDelim Value="\"/>
     <General>

trunk/Packages/Common/UPersistentForm.pas

@@ -26 +26 @@
     FormWindowState: TWindowState;
     Form: TForm;
+    DefaultFormWindowState: TWindowState;
     procedure LoadFromRegistry(RegistryContext: TRegistryContext);
     procedure SaveToRegistry(RegistryContext: TRegistryContext);
     function CheckEntireVisible(Rect: TRect): TRect;
     function CheckPartVisible(Rect: TRect; Part: Integer): TRect;
-    procedure Load(Form: TForm; DefaultMaximized: Boolean = False);
+    procedure Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
     procedure Save(Form: TForm);
     constructor Create(AOwner: TComponent); override;
@@ -56 +57 @@
   I: Integer;
   WinControl: TWinControl;
-  Count: Integer;
 begin
   if Control is TListView then begin
@@ -135 +135 @@
       + FormRestoredSize.Top;
     // Other state
-    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
+    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(DefaultFormWindowState)));
   finally
     Free;
@@ -216 +216 @@
 end;
 
-procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
-var
-  LoadDefaults: Boolean;
+procedure TPersistentForm.Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
 begin
   Self.Form := Form;
+  Self.DefaultFormWindowState := DefaultFormWindowState;
+
   // Set default
   FormNormalSize := Bounds((Screen.Width - Form.Width) div 2,
@@ -230 +230 @@
 
   if not EqualRect(FormNormalSize, FormRestoredSize) or
-    (LoadDefaults and DefaultMaximized) then begin
+    (FormWindowState = wsMaximized) then begin
     // Restore to maximized state
     Form.WindowState := wsNormal;

trunk/UCore.pas

@@ -104 +104 @@
   LastOpenedList.LoadFromRegistry(RegContext(Root, Key + '\' + RecentFilesRegKey));
   Targets.LoadFromRegistry(Root, Key);
-  PersistentForm1.RegistryContext := RegContext(Root, Key + '\Forms');
+  PersistentForm1.RegistryContext := RegContext(Root, Key);
 end;