Changeset 361 for branches/highdpi/LocalPlayer/NatStat.pas

Timestamp:

Apr 9, 2021, 5:56:50 PM (4 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r360 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/NatStat.pas (modified) (3 diffs)

branches/highdpi/LocalPlayer/NatStat.pas

@@ -81 +81 @@
   GetMem(SelfReport, SizeOf(TEnemyReport) - 2 * (INFIN + 1));
   ReportText := TStringList.Create;
-  InitButtons();
+  InitButtons;
   ContactBtn.Template := Templates.Data;
   HelpContext := 'DIPLOMACY';
@@ -107 +107 @@
 procedure TNatStatDlg.CheckAge;
 begin
-  if MainTextureAge <> AgePrepared then
-  begin
-    AgePrepared := MainTextureAge;
+  if MainTexture.Age <> AgePrepared then begin
+    AgePrepared := MainTexture.Age;
     DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
-      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
-      (hMainTexture - ClientHeight) div 2);
+      MainTexture.Image.Canvas, (MainTexture.Width - ClientWidth) div 2,
+      (MainTexture.Height - ClientHeight) div 2);
     ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
   end;
@@ -358 +357 @@
       with Canvas do
       begin
-        Brush.Color := MainTexture.clBevelShade;
+        Brush.Color := MainTexture.ColorBevelShade;
         FillRect(Rect(xReport + wReport, yReport + PaperShade,
           xReport + wReport + PaperShade, yReport + hReport + PaperShade));