Changeset 99 for trunk

Timestamp:

Jul 19, 2024, 11:05:07 PM (4 months ago)

Author:

chronos

Message:

• Fixed: Full screen mode switching.

Location:

trunk

Files:

• Forms/FormMain.pas (modified) (2 diffs)
• Packages/Common/Common.pas (modified) (2 diffs)
• Packages/Common/FormEx.pas (modified) (4 diffs)
• Packages/Common/PersistentForm.pas (modified) (4 diffs)

trunk/Forms/FormMain.pas

@@ -58 +58 @@
     MoveBuffer: array of TMoveDirection;
     MoveBufferLock: TCriticalSection;
-    FullScreen: Boolean;
     procedure AddToMoveBuffer(Direction: TMoveDirection);
     procedure ProcessMoveBuffer;
@@ -253 +252 @@
 begin
   FullScreen := not FullScreen;
-  Core.Core.PersistentForm1.Save(Self);
-  Core.Core.PersistentForm1.SetFullScreen(FormMain.FullScreen);
+  TFormEx.PersistentForm.Save(Self);
+  TFormEx.PersistentForm.SetFullScreen(FormMain.FullScreen);
   UpdateInterface;
 end;

trunk/Packages/Common/Common.pas

@@ -53 +53 @@
 function ComputerName: string;
 procedure DeleteFiles(APath, AFileSpec: string);
+function EndsWith(Text, What: string): Boolean;
 function Explode(Separator: Char; Data: string): TStringArray;
 procedure ExecuteProgram(Executable: string; Parameters: array of string);
@@ -87 +88 @@
 procedure SearchFiles(AList: TStrings; Dir: string;
   FilterMethod: TFilterMethod = nil; FileNameMethod: TFileNameMethod = nil);
+procedure SortStrings(Strings: TStrings);
 function SplitString(var Text: string; Count: Word): string;
 function StripTags(const S: string): string;
+function StartsWith(Text, What: string): Boolean;
 function TryHexToInt(Data: string; out Value: Integer): Boolean;
 function TryBinToInt(Data: string; out Value: Integer): Boolean;
-procedure SortStrings(Strings: TStrings);
 
 
 implementation
+
+function StartsWith(Text, What: string): Boolean;
+begin
+  Result := Copy(Text, 1, Length(Text)) = What;
+end;
+
+function EndsWith(Text, What: string): Boolean;
+begin
+  Result := Copy(Text, Length(Text) - Length(What) + 1, MaxInt) = What;
+end;
 
 function BinToInt(BinStr : string) : Int64;

trunk/Packages/Common/FormEx.pas

@@ -13 +13 @@
   private
     FCounter: Integer; static;
+    FFirstShow: Boolean;
   protected
     procedure DoShow; override;
@@ -19 +20 @@
     procedure DoDestroy; override;
   public
+    FullScreen: Boolean;
     PersistentForm: TPersistentForm; static;
     ThemeManager: TThemeManager; static;
@@ -44 +46 @@
 begin
   inherited;
-  PersistentForm.Load(Self);
+  if not FFirstShow and (not (csDesigning in ComponentState)) then begin
+    FFirstShow := True;
+    PersistentForm.Load(Self);
+    FullScreen := PersistentForm.FormFullScreen;
+  end;
 end;
 
@@ -76 +82 @@
 procedure TFormEx.DoClose(var CloseAction: TCloseAction);
 begin
-  PersistentForm.Save(Self);
+  if  (not (csDesigning in ComponentState)) then begin
+    PersistentForm.FormFullScreen := FullScreen;
+    PersistentForm.Save(Self);
+  end;
   inherited;
 end;

trunk/Packages/Common/PersistentForm.pas

@@ -16 +16 @@
     FMinVisiblePart: Integer;
     FRegistryContext: TRegistryContext;
+    FResizeEventOccured: Boolean;
     procedure LoadControl(Control: TControl);
     procedure SaveControl(Control: TControl);
+    procedure WindowStateChange(Sender: TObject);
   public
     FormRestoredSize: TRect;
@@ -301 +303 @@
 
 procedure TPersistentForm.SetFullScreen(State: Boolean);
+{$IFDEF UNIX}
+var
+  OldHandler: TNotifyEvent;
+var
+  I: Integer;
+{$ENDIF}
 begin
   if State then begin
@@ -312 +320 @@
     end;
     FormWindowState := Form.WindowState;
-    Form.WindowState := wsMaximized;
-    Form.WindowState := wsNormal;
-    ShowWindow(Form.Handle, SW_SHOWFULLSCREEN);
     {$IFDEF WINDOWS}
     Form.BorderStyle := bsNone;
     {$ENDIF}
+    Form.WindowState := wsFullscreen;
+    {$IFDEF UNIX}
+    // Workaround on Linux, WindowState is rewriten by WMSize event to wsNormal.
+    // We need for that even to occure
+    OldHandler := Form.OnWindowStateChange;
+    Form.OnWindowStateChange := WindowStateChange;
+    FResizeEventOccured := False;
+    for I := 0 to 10 do begin
+      if FResizeEventOccured then Break;
+      Application.ProcessMessages;
+      Sleep(1);
+    end;
+    Form.OnWindowStateChange := OldHandler;
+    {$ENDIF}
   end else begin
     FormFullScreen := False;
+    Form.WindowState := wsNormal;
     {$IFDEF WINDOWS}
     Form.BorderStyle := bsSizeable;
     {$ENDIF}
-    ShowWindow(Form.Handle, SW_SHOWNORMAL);
     if FormWindowState = wsNormal then begin
       Form.WindowState := wsNormal;
@@ -335 +354 @@
 end;
 
+procedure TPersistentForm.WindowStateChange(Sender: TObject);
+begin
+  Form.WindowState := wsFullscreen;
+  FResizeEventOccured := True;
+end;
+
 end.