Changeset 507 for trunk

Timestamp:

Dec 25, 2023, 12:01:22 PM (4 months ago)

Author:

chronos

Message:

• Fixed: Range check error on main form minimization.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (2 diffs)
• Packages/DpiControls/Dpi.PixelPointer.pas (modified) (2 diffs)

trunk/LocalPlayer/Term.pas

@@ -4197 +4197 @@
   MiniFrame, MaxMapWidth: Integer;
 begin
-  SmallScreen := ClientWidth < 1024;
+  SmallScreen := Width < 1024;
   with MainMap do begin
     MaxMapWidth := (G.lx * 2 - 3) * xxt;
     // avoide the same tile being visible left and right
-    if ClientWidth <= MaxMapWidth then begin
-      MapWidth := ClientWidth;
+    if Width <= MaxMapWidth then begin
+      MapWidth := Width;
       MapOffset := 0;
     end else begin
       MapWidth := MaxMapWidth;
-      MapOffset := (ClientWidth - MapWidth) div 2;
-    end;
-    MapHeight := ClientHeight - TopBarHeight - PanelHeight + Overlap;
-    Panel.SetSize(ClientWidth, PanelHeight);
-    TopBar.SetSize(ClientWidth, TopBarHeight);
+      MapOffset := (Width - MapWidth) div 2;
+    end;
+    MapHeight := Height - TopBarHeight - PanelHeight + Overlap;
+    Panel.SetSize(Width, PanelHeight);
+    TopBar.SetSize(Width, TopBarHeight);
     MiniFrame := (lxmax_xxx - G.ly) div 2;
     xMidPanel := (G.lx + MiniFrame) * 2 + 1;
-    xRightPanel := ClientWidth - LeftPanelWidth - 10;
+    xRightPanel := Width - LeftPanelWidth - 10;
     if ClientMode = cEditMap then
       TrPitch := 2 * xxt
@@ -4230 +4230 @@
   else if yw > ywmax then
     yw := ywmax;
-  UnitInfoBtn.Top := ClientHeight - 29;
+  UnitInfoBtn.Top := Height - 29;
   UnitInfoBtn.Left := xMidPanel + 7 + 99;
-  UnitBtn.Top := ClientHeight - 29;
+  UnitBtn.Top := Height - 29;
   UnitBtn.Left := xMidPanel + 7 + 99 + 31;
-  TerrainBtn.Top := ClientHeight - 29;
+  TerrainBtn.Top := Height - 29;
   TerrainBtn.Left := xMidPanel + 7 + 99 + 62;
-  MovieSpeed1Btn.Top := ClientHeight - 91;
-  MovieSpeed1Btn.Left := ClientWidth div 2 - 62;
-  MovieSpeed2Btn.Top := ClientHeight - 91;
-  MovieSpeed2Btn.Left := ClientWidth div 2 - 62 + 29;
-  MovieSpeed3Btn.Top := ClientHeight - 91;
-  MovieSpeed3Btn.Left := ClientWidth div 2 - 62 + 2 * 29;
-  MovieSpeed4Btn.Top := ClientHeight - 91;
-  MovieSpeed4Btn.Left := ClientWidth div 2 - 62 + 3 * 29 + 12;
-  EOT.Top := ClientHeight - 64;
-  EOT.Left := ClientWidth - 62;
-  sb.SetBorderSpacing(ClientHeight - yTroop - 24, ClientWidth - xRightPanel + 8, 8);
+  MovieSpeed1Btn.Top := Height - 91;
+  MovieSpeed1Btn.Left := Width div 2 - 62;
+  MovieSpeed2Btn.Top := Height - 91;
+  MovieSpeed2Btn.Left := Width div 2 - 62 + 29;
+  MovieSpeed3Btn.Top := Height - 91;
+  MovieSpeed3Btn.Left := Width div 2 - 62 + 2 * 29;
+  MovieSpeed4Btn.Top := Height - 91;
+  MovieSpeed4Btn.Left := Width div 2 - 62 + 3 * 29 + 12;
+  EOT.Top := Height - 64;
+  EOT.Left := Width - 62;
+  sb.SetBorderSpacing(Height - yTroop - 24, Width - xRightPanel + 8, 8);
   {TODO:
   SetWindowPos(sb.ScrollBar.Handle, 0, xRightPanel + 10 - 14 - GetSystemMetrics(SM_CXVSCROLL),
-    ClientHeight - MidPanelHeight + 8, 0, 0, SWP_NOSIZE or SWP_NOZORDER);
+    Height - MidPanelHeight + 8, 0, 0, SWP_NOSIZE or SWP_NOZORDER);
     }
   MapBtn0.Left := xMini + G.lx - 44;
-  MapBtn0.Top := ClientHeight - 15;
+  MapBtn0.Top := Height - 15;
   MapBtn1.Left := xMini + G.lx - 28;
-  MapBtn1.Top := ClientHeight - 15;
-  { MapBtn2.Left:=xMini+G.lx-20;
-    MapBtn2.Top:=ClientHeight-15;
-    MapBtn3.Left:=xMini+G.lx-4;
-    MapBtn3.Top:=ClientHeight-15; }
+  MapBtn1.Top := Height - 15;
+  { MapBtn2.Left := xMini + G.lx - 20;
+    MapBtn2.Top := Height - 15;
+    MapBtn3.Left := xMini + G.lx - 4;
+    MapBtn3.Top := Height - 15; }
   MapBtn5.Left := xMini + G.lx - 12;
-  MapBtn5.Top := ClientHeight - 15;
+  MapBtn5.Top := Height - 15;
   MapBtn4.Left := xMini + G.lx + 20;
-  MapBtn4.Top := ClientHeight - 15;
+  MapBtn4.Top := Height - 15;
   MapBtn6.Left := xMini + G.lx + 36;
-  MapBtn6.Top := ClientHeight - 15;
-  TreasuryArea.Left := ClientWidth div 2 - 172;
-  ResearchArea.Left := ClientWidth div 2;
-  ManagementArea.Left := ClientWidth - xPalace;
+  MapBtn6.Top := Height - 15;
+  TreasuryArea.Left := Width div 2 - 172;
+  ResearchArea.Left := Width div 2;
+  ManagementArea.Left := Width - xPalace;
   ManagementArea.Top := TopBarHeight + MapHeight - Overlap + yPalace;
   ArrangeMidPanel;
   if RepaintOnResize then
   begin
-    RectInvalidate(0, TopBarHeight, ClientWidth, TopBarHeight + MapHeight);
+    RectInvalidate(0, TopBarHeight, Width, TopBarHeight + MapHeight);
     MapValid := False;
     PaintAll;

trunk/Packages/DpiControls/Dpi.PixelPointer.pas

@@ -148 +148 @@
 {$IFOPT R+}
 var
+  B: Integer;
   X: Integer;
   Y: Integer;
@@ -155 +156 @@
   if (PByte(Pixel) < PByte(Data)) or
     (PByte(Pixel) >= PByte(Data) + Height * BytesPerLine) then begin
-    X := PByte(Pixel) - PByte(Data);
-    Y := Floor(X / BytesPerLine);
-    X := X - Y * BytesPerLine;
+    B := PByte(Pixel) - PByte(Data);
+    Y := Floor(B / BytesPerLine);
+    X := B - Y * BytesPerLine;
     X := Floor(X / BytesPerPixel);
     raise Exception.Create(Format(SOutOfRange, [X, Y]));