Changeset 328 for trunk/Packages/Common/PersistentForm.pas

Timestamp:

Jul 19, 2024, 8:40:00 PM (4 months ago)

Author:

chronos

Message:

• Fixed: Full screen switching on Windows.
• Fixed: Main form was not visible on Windows task bar.

File:

• trunk/Packages/Common/PersistentForm.pas (modified) (4 diffs)

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.