Changeset 534 for trunk

Timestamp:

Apr 15, 2024, 8:29:24 PM (2 weeks ago)

Author:

chronos

Message:

• Fixed: Resize and repaint on editor start and map zoom.

File:

• trunk/LocalPlayer/Term.pas (modified) (6 diffs)

trunk/LocalPlayer/Term.pas

@@ -349 +349 @@
     FMessgExDlg: TMessgExDlg;
     FHelpDlg: THelpDlg;
+    procedure ResizeControls;
     procedure ArrangeDialogs;
     procedure ArrangeDialog(Form: TBufferedDrawDlg);
@@ -2956 +2957 @@
         TurnComplete := False;
         MapValid := False;
-        FormResize(nil); // calculate geometrics and paint all
+        ResizeControls;
         SetTroopLoc(-1);
         Idle := True;
@@ -4196 +4197 @@
 
 procedure TMainScreen.FormResize(Sender: TObject);
-var
-  MiniFrame, MaxMapWidth: Integer;
 begin
   if (LastResizeWidth = Width) and (LastResizeHeight = Height) and
@@ -4207 +4206 @@
   end;
 
-  SmallScreen := Width < 1024;
-  with MainMap do begin
-    MaxMapWidth := (G.lx * 2 - 3) * xxt;
-    // avoide the same tile being visible left and right
-    if Width <= MaxMapWidth then begin
-      MapWidth := Width;
-      MapOffset := 0;
-    end else begin
-      MapWidth := MaxMapWidth;
-      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 := Width - LeftPanelWidth - 10;
-    if ClientMode = cEditMap then
-      TrPitch := 2 * xxt
-    else
-      TrPitch := 66;
-    xMini := MiniFrame - 5;
-    yMini := (PanelHeight - 26 - lxmax_xxx) div 2 + MiniFrame;
-    ywmax := (G.ly - MapHeight div yyt + 1) and not 1;
-    ywcenter := -((MapHeight - yyt * (G.ly - 1)) div (4 * yyt)) * 2;
-  end;
-  // only for ywmax<=0
-  if ywmax <= 0 then
-    yw := ywcenter
-  else if yw < 0 then
-    yw := 0
-  else if yw > ywmax then
-    yw := ywmax;
-  UnitInfoBtn.Top := Height - 29;
-  UnitInfoBtn.Left := xMidPanel + 7 + 99;
-  UnitBtn.Top := Height - 29;
-  UnitBtn.Left := xMidPanel + 7 + 99 + 31;
-  TerrainBtn.Top := Height - 29;
-  TerrainBtn.Left := xMidPanel + 7 + 99 + 62;
-  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);
-  SetWindowPos(sb.ScrollBar.Handle, 0, xRightPanel + 10 - 14 - GetSystemMetrics(SM_CXVSCROLL),
-    Height - MidPanelHeight + 8, 0, 0, SWP_NOSIZE or SWP_NOZORDER);
-  MapBtn0.Left := xMini + G.lx - 44;
-  MapBtn0.Top := Height - 15;
-  MapBtn1.Left := xMini + G.lx - 28;
-  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 := Height - 15;
-  MapBtn4.Left := xMini + G.lx + 20;
-  MapBtn4.Top := Height - 15;
-  MapBtn6.Left := xMini + G.lx + 36;
-  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, Width, TopBarHeight + MapHeight);
-    MapValid := False;
-    PaintAll;
-  end;
+  ResizeControls;
 end;
 
@@ -8297 +8220 @@
   MainMap.TileSize := TileSize;
   NoMap.TileSize := TileSize;
-  FormResize(nil);
+  LastResizeWidth := -1; // Force repaint on
+  ResizeControls;
   SetMapPos(Loc, MapPos);
   PaintAllMaps;
@@ -8342 +8266 @@
 end;
 
+procedure TMainScreen.ResizeControls;
+var
+  MiniFrame, MaxMapWidth: Integer;
+begin
+  SmallScreen := Width < 1024;
+  with MainMap do begin
+    MaxMapWidth := (G.lx * 2 - 3) * xxt;
+    // Avoid the same tile being visible left and right
+    if Width <= MaxMapWidth then begin
+      MapWidth := Width;
+      MapOffset := 0;
+    end else begin
+      MapWidth := MaxMapWidth;
+      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 := Width - LeftPanelWidth - 10;
+    if ClientMode = cEditMap then
+      TrPitch := 2 * xxt
+    else
+      TrPitch := 66;
+    xMini := MiniFrame - 5;
+    yMini := (PanelHeight - 26 - lxmax_xxx) div 2 + MiniFrame;
+    ywmax := (G.ly - MapHeight div yyt + 1) and not 1;
+    ywcenter := -((MapHeight - yyt * (G.ly - 1)) div (4 * yyt)) * 2;
+  end;
+  // only for ywmax<=0
+  if ywmax <= 0 then
+    yw := ywcenter
+  else if yw < 0 then
+    yw := 0
+  else if yw > ywmax then
+    yw := ywmax;
+  UnitInfoBtn.Top := Height - 29;
+  UnitInfoBtn.Left := xMidPanel + 7 + 99;
+  UnitBtn.Top := Height - 29;
+  UnitBtn.Left := xMidPanel + 7 + 99 + 31;
+  TerrainBtn.Top := Height - 29;
+  TerrainBtn.Left := xMidPanel + 7 + 99 + 62;
+  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);
+  SetWindowPos(sb.ScrollBar.Handle, 0, xRightPanel + 10 - 14 - GetSystemMetrics(SM_CXVSCROLL),
+    Height - MidPanelHeight + 8, 0, 0, SWP_NOSIZE or SWP_NOZORDER);
+  MapBtn0.Left := xMini + G.lx - 44;
+  MapBtn0.Top := Height - 15;
+  MapBtn1.Left := xMini + G.lx - 28;
+  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 := Height - 15;
+  MapBtn4.Left := xMini + G.lx + 20;
+  MapBtn4.Top := Height - 15;
+  MapBtn6.Left := xMini + G.lx + 36;
+  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, Width, TopBarHeight + MapHeight);
+    MapValid := False;
+    PaintAll;
+  end;
+end;
+
 procedure TMainScreen.ArrangeDialogs;
 begin