Changeset 460 for trunk/Packages

Timestamp:

Nov 28, 2023, 3:16:24 PM (6 months ago)

Author:

chronos

Message:

• Modified: Do not initialize all local player windows at the start of the game but later when they are really opened. This also fixes window initialization under Qt5 widgetset.

Location:

trunk/Packages/CevoComponents

Files:

• BaseWin.pas (modified) (5 diffs)
• DrawDlg.pas (modified) (11 diffs)

trunk/Packages/CevoComponents/BaseWin.pas

@@ -14 +14 @@
 
   TBufferedDrawDlg = class(TDrawDlg)
-  public
-    UserLeft: Integer;
-    UserTop: Integer;
-    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
-    procedure FormClose(Sender: TObject; var Action: TCloseAction);
-    procedure FormPaint(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure FormDeactivate(Sender: TObject);
-    procedure SmartUpdateContent(ImmUpdate: Boolean = False);
-    procedure StayOnTop_Workaround;
   protected
     FWindowMode: TWindowMode;
@@ -34 +23 @@
     procedure VPaint; virtual;
   public
+    UserLeft: Integer;
+    UserTop: Integer;
     UsedOffscreenWidth: Integer;
     UsedOffscreenHeight: Integer;
     Offscreen: TBitmap;
     OffscreenUser: TForm;
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormPaint(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure FormDeactivate(Sender: TObject);
+    procedure SmartUpdateContent(ImmUpdate: Boolean = False);
+    procedure StayOnTop_Workaround;
     property WindowMode: TWindowMode read FWindowMode;
   end;
 
   TFramedDlg = class(TBufferedDrawDlg)
-  public
-    constructor Create(AOwner: TComponent); override;
-    procedure FormCreate(Sender: TObject);
-    procedure SmartInvalidate; override;
   protected
     CaptionLeft: Integer;
@@ -58 +53 @@
     procedure VPaint; override;
     procedure FillOffscreen(Left, Top, Width, Height: Integer);
+  public
+    constructor Create(AOwner: TComponent); override;
+    procedure FormCreate(Sender: TObject);
+    procedure SmartInvalidate; override;
   end;
 
@@ -120 +119 @@
     UserTop := Top;
   end;
-  if OffscreenUser = self then
+  if OffscreenUser = Self then
     OffscreenUser := nil;
 end;
@@ -126 +125 @@
 procedure TBufferedDrawDlg.FormPaint(Sender: TObject);
 begin
-  if OffscreenUser <> self then
+  if OffscreenUser <> Self then
     OffscreenPaint;
   VPaint;

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -46 +46 @@
     Lines: Integer;
     TopSpace: Integer;
-    procedure SplitText(preview: boolean);
+    procedure SplitText(Preview: Boolean);
     procedure CorrectHeight;
   end;
@@ -206 +206 @@
 procedure TDrawDlg.InitButtons;
 var
-  cix: integer;
+  cix: Integer;
   // ButtonDownSound, ButtonUpSound: string;
 begin
@@ -228 +228 @@
 procedure TDrawDlg.SmartInvalidate;
 var
-  i: integer;
+  i: Integer;
   r0, r1: HRgn;
 begin
@@ -240 +240 @@
       DeleteObject(r1);
     end;
-  InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
@@ -260 +260 @@
 procedure TBaseMessgDlg.FormPaint(Sender: TObject);
 var
-  i, cix: integer;
+  i, cix: Integer;
 begin
   if csDesigning in ComponentState then Exit;
-  PaintBackground(self, 3 + Border, 3 + Border, ClientWidth - (6 + 2 * Border),
+  PaintBackground(Self, 3 + Border, 3 + Border, ClientWidth - (6 + 2 * Border),
     ClientHeight - (6 + 2 * Border));
   for i := 0 to Border do
@@ -274 +274 @@
     ClientHeight - (3 + Border), MainTexture.ColorBevelLight,
     MainTexture.ColorBevelShade);
-  SplitText(false);
+  SplitText(False);
 
   for cix := 0 to ControlCount - 1 do
@@ -281 +281 @@
 end;
 
-procedure TBaseMessgDlg.SplitText(preview: boolean);
-var
-  Start, Stop, OrdinaryStop, LinesCount: integer;
+procedure TBaseMessgDlg.SplitText(Preview: Boolean);
+var
+  Start, Stop, OrdinaryStop, LinesCount: Integer;
   s: string;
 begin
@@ -294 +294 @@
       (BiColorTextWidth(Canvas, Copy(MessgText, Start, Stop - Start + 1)) <
       ClientWidth - 56) do
-      inc(Stop);
+      Inc(Stop);
     if Stop <> Length(MessgText) then
     begin
@@ -303 +303 @@
         (MessgText[OrdinaryStop + 1] = '\');
       if (OrdinaryStop + 1 - Start) * 2 >= Stop - Start then
-        Stop := OrdinaryStop
-    end;
-    if not preview then
+        Stop := OrdinaryStop;
+    end;
+    if not Preview then
     begin
       s := Copy(MessgText, Start, Stop - Start + 1);
@@ -313 +313 @@
     end;
     Start := Stop + 2;
-    inc(LinesCount)
-  end;
-  if preview then
+    inc(LinesCount);
+  end;
+  if Preview then
     Lines := LinesCount;
 end;
@@ -321 +321 @@
 procedure TBaseMessgDlg.CorrectHeight;
 var
-  i: integer;
+  i: Integer;
 begin
   ClientHeight := 72 + Border + TopSpace + Lines * MessageLineSpacing;