Changeset 533 for trunk

Timestamp:

Apr 12, 2024, 8:58:58 PM (8 months ago)

Author:

chronos

Message:

• Fixed: Eliminated unwanted second map resize and redraw during displaying of the main game window.

Location:

trunk

Files:

• LocalPlayer/IsoEngine.pas (modified) (4 diffs)
• LocalPlayer/Term.lfm (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (8 diffs)
• Packages/CevoComponents/EOTButton.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (1 diff)
• Start.pas (modified) (2 diffs)

trunk/LocalPlayer/IsoEngine.pas

@@ -380 +380 @@
     for Y := -2 to 6 do
       BitBltBitmap(LandPatch, (X + 2) * (xxt * 2), (Y + 2) * yyt, xxt,
-        yyt, HGrTerrain.Data, xSrc + xxt, ySrc + yyt,
-        SRCPAINT);
+        yyt, HGrTerrain.Data, xSrc + xxt, ySrc + yyt, SRCPAINT);
     for Y := -2 to 6 do
       BitBltBitmap(LandPatch, (X + 2) * (xxt * 2) + xxt, (Y + 2) * yyt,
-        xxt, yyt, HGrTerrain.Data, xSrc, ySrc + yyt,
-        SRCPAINT);
+        xxt, yyt, HGrTerrain.Data, xSrc, ySrc + yyt, SRCPAINT);
     for Y := -2 to 6 do
       BitBltBitmap(LandPatch, (X + 2) * (xxt * 2), (Y + 2) * yyt, xxt,
@@ -413 +411 @@
     for X := 0 to 7 do
       BitBltBitmap(LandMore, (X + 2) * (xxt * 2) - xxt, (Y + 2) * yyt,
-        xxt * 2, yyt, HGrTerrain.Data, xSrc, ySrc + yyt,
-        SRCPAINT);
+        xxt * 2, yyt, HGrTerrain.Data, xSrc, ySrc + yyt, SRCPAINT);
     for X := -2 to 6 do
       BitBltBitmap(LandMore, (X + 2) * (xxt * 2), (Y + 2) * yyt,
@@ -432 +429 @@
       begin
         BitBltBitmap(OceanPatch, X * (xxt * 2), Y * yyt, xxt, yyt,
-          HGrTerrain.Data, xSrc + xxt, ySrc + yyt,
-          SRCPAINT);
+          HGrTerrain.Data, xSrc + xxt, ySrc + yyt, SRCPAINT);
         BitBltBitmap(OceanPatch, X * (xxt * 2) + xxt, Y * yyt, xxt, yyt,
           HGrTerrain.Data, xSrc, ySrc + yyt, SRCPAINT);
@@ -456 +452 @@
       begin
         BitBltBitmap(OceanMore, X * (xxt * 2), Y * yyt, xxt, yyt,
-          HGrTerrain.Data, xSrc + xxt, ySrc + yyt,
-          SRCPAINT);
+          HGrTerrain.Data, xSrc + xxt, ySrc + yyt, SRCPAINT);
         BitBltBitmap(OceanMore, X * (xxt * 2) + xxt, Y * yyt, xxt, yyt,
           HGrTerrain.Data, xSrc, ySrc + yyt, SRCPAINT);

trunk/LocalPlayer/Term.lfm

@@ -33 +33 @@
   LCLVersion = '2.2.0.4'
   Scaled = False
-  WindowState = wsMaximized
+  WindowState = wsNormal
   object UnitBtn: TButtonB
     Tag = 14

trunk/LocalPlayer/Term.pas

@@ -245 +245 @@
     procedure FormResize(Sender: TObject);
     procedure PanelBtnClick(Sender: TObject);
-    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure Toggle(Sender: TObject);
     procedure PanelBoxMouseMove(Sender: TObject; Shift: TShiftState;
@@ -260 +259 @@
       Shift: TShiftState; X, Y: Integer);
     procedure FormPaint(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
+    procedure FormShow(Sender: TObject);
     procedure mRepClicked(Sender: TObject);
     procedure mLogClick(Sender: TObject);
-    procedure FormClose(Sender: TObject; var Action: TCloseAction);
-    procedure FormShow(Sender: TObject);
     procedure Radio(Sender: TObject);
     procedure mManipClick(Sender: TObject);
@@ -329 +329 @@
     NoMap: TIsoMap;
     NoMapPanel: TIsoMap;
+    LastResizeWidth: Integer;
+    LastResizeHeight: Integer;
+    LastWindowState: TWindowState;
     // Forms
     FWondersDlg: TWondersDlg;
@@ -2815 +2818 @@
           Brush.Style := TBrushStyle.bsClear;
         end;
-        FormResize(nil); // place mini map correctly according to its size
         Show;
         Update;
@@ -4197 +4199 @@
   MiniFrame, MaxMapWidth: Integer;
 begin
+  if (LastResizeWidth = Width) and (LastResizeHeight = Height) and
+    (LastWindowState = WindowState) then Exit
+  else begin
+    LastResizeWidth := Width;
+    LastResizeHeight := Height;
+    LastWindowState := WindowState;
+  end;
+
   SmallScreen := Width < 1024;
   with MainMap do begin
@@ -7091 +7101 @@
     if not Active and (CurrentWindowState = TWindowState.wsFullScreen) then begin
       if PrevWindowState = TWindowState.wsMaximized then begin
-        CurrentWindowState := TWindowState.wsMaximized;
+        CurrentWindowState := TWindowState.wsNormal;
         WindowState := CurrentWindowState;
       end else begin
-        CurrentWindowState := TWindowState.wsNormal;
+        CurrentWindowState := PrevWindowState;
         WindowState := CurrentWindowState;
         WindowState := TWindowState.wsFullScreen;
@@ -8106 +8116 @@
 procedure TMainScreen.FormShow(Sender: TObject);
 begin
+  if FullScreen then BoundsRect := Bounds(0, 0, Screen.Width, Screen.Height)
+    else BoundsRect := TermBounds;
   SetFullScreen(FullScreen);
+  FormResize(nil); // place mini map correctly according to its size
   Timer1.Enabled := True;
 end;
@@ -8112 +8125 @@
 procedure TMainScreen.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
+  TermBounds := BoundsRect;
   Timer1.Enabled := False;
 end;

trunk/Packages/CevoComponents/EOTButton.pas

@@ -85 +85 @@
     end else begin
       Brush.Color := $0000FF;
-      FrameRect(Rect(0, 0, 48, 48))
+      FrameRect(Rect(0, 0, 48, 48));
     end;
 end;

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -193 +193 @@
   DrawBuffer: TBitmap;
   FullScreen: Boolean;
+  TermBounds: TRect;
   GenerateNames: Boolean;
   InitOrnamentDone: Boolean;

trunk/Start.pas

@@ -407 +407 @@
       else ScreenMode := 1;
     FullScreen := ScreenMode > 0;
+    if ValueExists('TermLeft') then TermBounds.Left := ReadInteger('TermLeft')
+      else TermBounds.Left := 0;
+    if ValueExists('TermTop') then TermBounds.Top := ReadInteger('TermTop')
+      else TermBounds.Top := 0;
+    if ValueExists('TermWidth') then TermBounds.Width := ReadInteger('TermWidth')
+      else TermBounds.Width := 800;
+    if ValueExists('TermHeight') then TermBounds.Height := ReadInteger('TermHeight')
+      else TermBounds.Height := 480;
+
     if ValueExists('MultiControl') then
       MultiControl := ReadInteger('MultiControl')
@@ -444 +453 @@
     if FullScreen then WriteInteger('ScreenMode', 1)
       else WriteInteger('ScreenMode', 0);
+    WriteInteger('TermWidth', TermBounds.Width);
+    WriteInteger('TermHeight', TermBounds.Height);
+    WriteInteger('TermLeft', TermBounds.Left);
+    WriteInteger('TermTop', TermBounds.Top);
     WriteInteger('MultiControl', MultiControl);
     WriteInteger('StartTab', Integer(ShowTab));