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

Timestamp:

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

Author:

chronos

Message:

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

File:

• branches/highdpi/LocalPlayer/UnitStat.pas (modified) (19 diffs)

branches/highdpi/LocalPlayer/UnitStat.pas

@@ -77 +77 @@
   AgePrepared := -2;
   TitleHeight := DpiScreen.Height;
-  InitButtons();
+  InitButtons;
 
   Back := TDpiBitmap.Create;
@@ -98 +98 @@
 procedure TUnitStatDlg.CheckAge;
 begin
-  if MainTextureAge <> AgePrepared then
-  begin
-    AgePrepared := MainTextureAge;
+  if MainTexture.Age <> AgePrepared then begin
+    AgePrepared := MainTexture.Age;
     DpiBitCanvas(Back.Canvas, 0, 0, wCommon, hOwnModel,
-      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hOwnModel) div 2);
+      MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
+      (MainTexture.Height - hOwnModel) div 2);
     DpiBitCanvas(Back.Canvas, wCommon, 0, wCommon, hEnemyModel,
-      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hEnemyModel) div 2);
+      MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
+      (MainTexture.Height - hEnemyModel) div 2);
     DpiBitCanvas(Back.Canvas, 2 * wCommon, 0, wCommon, hEnemyUnit,
-      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hEnemyUnit) div 2);
+      MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
+      (MainTexture.Height - hEnemyUnit) div 2);
     DpiBitCanvas(Back.Canvas, 3 * wCommon, 0, wCommon, hEnemyCityDefense,
-      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hEnemyCityDefense) div 2);
+      MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
+      (MainTexture.Height - hEnemyCityDefense) div 2);
     DpiBitCanvas(Back.Canvas, 4 * wCommon, 0, wCommon, hEnemyCity,
-      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hEnemyCity) div 2);
+      MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
+      (MainTexture.Height - hEnemyCity) div 2);
     ImageOp_B(Back, Template, 0, 0, 0, 0, 5 * wCommon, hMax);
-  end
+  end;
 end;
 
@@ -151 +150 @@
         dec(ecixShow);
       assert(ecixShow >= 0);
-    end
+    end;
   end;
   case Kind of
@@ -297 +296 @@
       result := (PPicture.HGr = PTestPicture.HGr) and
         (PPicture.pix = PTestPicture.pix) and
-        (ModelHash(mox^) = ModelHash(MyRO.EnemyModel[emix]))
+        (ModelHash(mox^) = ModelHash(MyRO.EnemyModel[emix]));
     end
     else
       result := (MyRO.EnemyModel[emix].owner = mox.owner) and
-        (MyRO.EnemyModel[emix].mix = mox.mix)
+        (MyRO.EnemyModel[emix].mix = mox.mix);
   end;
 
   procedure FeatureBar(dst: TDpiBitmap; x, y: integer; const mi: TModelInfo;
-    const T: TTexture);
+    T: TTexture);
   var
     i, w, dx, num: integer;
@@ -371 +370 @@
   end; { featurebar }
 
-  procedure NumberBarS(dst: TDpiBitmap; x, y: integer; Cap, s: string;
-    const T: TTexture);
-  begin
-    DLine(dst.Canvas, x - 2, x + 170, y + 16, T.clBevelShade, T.clBevelLight);
+  procedure NumberBarS(dst: TDpiBitmap; x, y: integer; Cap, s: string; T: TTexture);
+  begin
+    DLine(dst.Canvas, x - 2, x + 170, y + 16, T.ColorBevelShade, T.ColorBevelLight);
     LoweredTextOut(dst.Canvas, -1, T, x - 2, y, Cap);
     RisedTextout(dst.Canvas, x + 170 - BiColorTextWidth(dst.Canvas, s), y, s);
@@ -437 +435 @@
       begin
         case i of
-          0:
-            j := imWalls;
-          1:
-            j := imCoastalFort;
-          2:
-            j := imMissileBat;
-          3:
-            j := imBunker
+          0: j := imWalls;
+          1: j := imCoastalFort;
+          2: j := imMissileBat;
+          3: j := imBunker
         end;
         Frame(offscreen.Canvas, x - 1, yImp - 1, x + xSizeSmall,
-          yImp + ySizeSmall, MainTexture.clBevelLight,
-          MainTexture.clBevelShade);
+          yImp + ySizeSmall, MainTexture.ColorBevelLight,
+          MainTexture.ColorBevelShade);
         DpiBitCanvas(offscreen.Canvas, x, yImp, xSizeSmall, ySizeSmall,
           SmallImp.Canvas, j mod 7 * xSizeSmall,
           (j + SystemIconLines * 7) div 7 * ySizeSmall);
-        inc(x, xSizeSmall + 4)
+        inc(x, xSizeSmall + 4);
       end;
   end;
@@ -469 +463 @@
             if IsToCount(MyRO.EnemyUn[MyRO.nEnemyUn + uix].emix) then
               inc(Available);
-        end
+        end;
       end
     else // no supervisor -- can only count stack top units
@@ -512 +506 @@
     begin
       MakeUnitInfo(me, MyUn[uixShow], ui);
-      MakeModelInfo(me, MyUn[uixShow].mix, MyModel[MyUn[uixShow].mix], mi)
+      MakeModelInfo(me, MyUn[uixShow].mix, MyModel[MyUn[uixShow].mix], mi);
     end
     else
@@ -518 +512 @@
       mi := mox^;
       if Kind in [dkEnemyUnit, dkEnemyCityDefense] then
-        ui := MyRO.EnemyUn[euixShow]
+        ui := MyRO.EnemyUn[euixShow];
     end;
 
@@ -527 +521 @@
         begin
           { Frame(offscreen.canvas,xView-1,yView-1,xView+64,yView+48,
-            MainTexture.clBevelShade,MainTexture.clBevelLight);
+            MainTexture.ColorBevelShade,MainTexture.ColorBevelLight);
             RFrame(offscreen.canvas,xView-2,yView-2,xView+65,yView+49,
-            MainTexture.clBevelShade,MainTexture.clBevelLight); }
+            MainTexture.ColorBevelShade,MainTexture.ColorBevelLight); }
           with offscreen.Canvas do
           begin
@@ -541 +535 @@
           begin
             x := 1 + 2 * (xxt * 2 + 1);
-            y := 1 + yyt + 2 * (yyt * 3 + 1)
+            y := 1 + yyt + 2 * (yyt * 3 + 1);
           end
           else
           begin
             x := integer(MyMap[Loc] and fTerrain) * (xxt * 2 + 1) + 1;
-            y := 1 + yyt
+            y := 1 + yyt;
           end;
           for j := -1 to 1 do
@@ -594 +588 @@
               (ClientWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2,
               yView + 80, s);
-          end
+          end;
         end
       else
@@ -615 +609 @@
         Phrases.Lookup('UNITCOST'));
       DLine(offscreen.Canvas, xTotal - 2, xTotal + 170, yTotal + 57 + 16,
-        MainTexture.clBevelShade, MainTexture.clBevelLight);
+        MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
       if G.Difficulty[me] = 0 then
         s := IntToStr(mi.cost)
@@ -636 +630 @@
               (yTotal + StatDown - 19), Phrases.Lookup('UNITINTRO'));
           DLine(offscreen.Canvas, xTotal - 2, xTotal + 170,
-            (yTotal + StatDown - 19) + 16, MainTexture.clTextShade,
-            MainTexture.clTextLight);
+            (yTotal + StatDown - 19) + 16, MainTexture.ColorTextShade,
+            MainTexture.ColorTextLight);
           s := TurnToString(MyModel[mixShow].IntroTurn);
           RisedTextout(offscreen.Canvas,
@@ -675 +669 @@
           ConscriptsBtn.ButtonIndex := 29;
           ConscriptsBtn.Hint := Phrases.Lookup('BTN_ALLOWCONSCRIPTS');
-        end
+        end;
       end
       else if Kind = dkEnemyModel then
@@ -685 +679 @@
           NumberBar(offscreen, xTotal, yTotal + StatDown,
             Phrases.Lookup('UNITKNOWN'), Available, MainTexture);
-      end
+      end;
     end;
   end;
@@ -705 +699 @@
 procedure TUnitStatDlg.ModelBoxChange(Sender: TObject);
 begin
-  SmartUpdateContent
+  SmartUpdateContent;
 end;
 
@@ -720 +714 @@
     SwitchBtn.ButtonIndex := 11;
     SwitchBtn.Hint := Phrases.Lookup('BTN_NONOBSOLETE');
-  end
+  end;
 end;
 
@@ -735 +729 @@
     ConscriptsBtn.ButtonIndex := 29;
     ConscriptsBtn.Hint := Phrases.Lookup('BTN_ALLOWCONSCRIPTS');
-  end
+  end;
 end;
 
 procedure TUnitStatDlg.HelpBtnClick(Sender: TObject);
 begin
-  HelpDlg.ShowNewContent(wmPersistent, hkModel, 0)
+  HelpDlg.ShowNewContent(wmPersistent, hkModel, 0);
 end;