Changeset 116 for trunk/Packages/Common/UPersistentForm.pas

Timestamp:

Aug 18, 2021, 5:50:18 PM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package files.
• Fixed: Translation of About dialog.
• Added: Snap package definition file.
• Modified: Detect different data dir on Linux.

File:

• trunk/Packages/Common/UPersistentForm.pas (modified) (12 diffs)

trunk/Packages/Common/UPersistentForm.pas

@@ -3 +3 @@
 {$mode delphi}
 
-// Date: 2015-04-18
+// Date: 2020-11-26
 
 interface
@@ -9 +9 @@
 uses
   Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls,
-  ExtCtrls;
+  ExtCtrls, LCLType;
 
 type
@@ -26 +26 @@
     FormRestoredSize: TRect;
     FormWindowState: TWindowState;
+    FormFullScreen: Boolean;
     Form: TForm;
     procedure LoadFromRegistry(RegistryContext: TRegistryContext);
@@ -31 +32 @@
     function CheckEntireVisible(Rect: TRect): TRect;
     function CheckPartVisible(Rect: TRect; Part: Integer): TRect;
-    procedure Load(Form: TForm; DefaultMaximized: Boolean = False);
+    procedure Load(Form: TForm; DefaultMaximized: Boolean = False;
+      DefaultFullScreen: Boolean = False);
     procedure Save(Form: TForm);
     constructor Create(AOwner: TComponent); override;
+    procedure SetFullScreen(State: Boolean);
     property RegistryContext: TRegistryContext read FRegistryContext
       write FRegistryContext;
@@ -43 +46 @@
 procedure Register;
 
+
 implementation
-
 
 procedure Register;
@@ -169 +172 @@
       + FormRestoredSize.Top;
     // Other state
-    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
+    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(FormWindowState)));
+    FormFullScreen := ReadBoolWithDefault('FullScreen', FormFullScreen);
   finally
     Free;
@@ -193 +197 @@
     // Other state
     WriteInteger('WindowState', Integer(FormWindowState));
+    WriteBool('FullScreen', FormFullScreen);
   finally
     Free;
@@ -250 +255 @@
 end;
 
-procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
+procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False;
+  DefaultFullScreen: Boolean = False);
 begin
   Self.Form := Form;
@@ -258 +264 @@
   FormRestoredSize := Bounds((Screen.Width - Form.Width) div 2,
     (Screen.Height - Form.Height) div 2, Form.Width, Form.Height);
+  FormWindowState := Form.WindowState;
+  FormFullScreen := DefaultFullScreen;
 
   LoadFromRegistry(RegistryContext);
@@ -277 +285 @@
       Form.BoundsRect := FormNormalSize;
   end;
+  if FormFullScreen then SetFullScreen(True);
   LoadControl(Form);
 end;
@@ -284 +293 @@
   Self.Form := Form;
   FormNormalSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
-  FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
-    Form.RestoredHeight);
+  if not FormFullScreen then
+    FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+      Form.RestoredHeight);
   FormWindowState := Form.WindowState;
   SaveToRegistry(RegistryContext);
@@ -300 +310 @@
 end;
 
+procedure TPersistentForm.SetFullScreen(State: Boolean);
+begin
+  if State then begin
+    FormFullScreen := True;
+    FormNormalSize := Form.BoundsRect;
+    FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+      Form.RestoredHeight);
+    FormWindowState := Form.WindowState;
+    ShowWindow(Form.Handle, SW_SHOWFULLSCREEN);
+    {$IFDEF WINDOWS}
+    Form.BorderStyle := bsNone;
+    {$ENDIF}
+  end else begin
+    FormFullScreen := False;
+    {$IFDEF WINDOWS}
+    Form.BorderStyle := bsSizeable;
+    {$ENDIF}
+    ShowWindow(Form.Handle, SW_SHOWNORMAL);
+    if FormWindowState = wsNormal then begin
+      Form.BoundsRect := FormNormalSize;
+    end else
+    if FormWindowState = wsMaximized then begin
+      Form.BoundsRect := FormRestoredSize;
+      Form.WindowState := wsMaximized;
+    end;
+  end;
+end;
+
 end.