Changeset 178 for branches/highdpi/LocalPlayer/IsoEngine.pas

Timestamp:

Jun 23, 2019, 3:15:29 PM (5 years ago)

Author:

chronos

Message:

• Modified: Use DpiControls package for High DPI support.

File:

• branches/highdpi/LocalPlayer/IsoEngine.pas (modified) (12 diffs)

branches/highdpi/LocalPlayer/IsoEngine.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, ScreenTools, Tribes,
+  Protocol, ClientTools, ScreenTools, Tribes, UDpiControls,
 {$IFNDEF SCR}Term, {$ENDIF}
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, PixelPointer;
+  LCLIntf, LCLType, SysUtils, Classes, Graphics;
 
 type
@@ -16 +16 @@
   TIsoMap = class
     constructor Create;
-    procedure SetOutput(Output: TBitmap);
+    procedure SetOutput(Output: TDpiBitmap);
     procedure SetPaintBounds(Left, Top, Right, Bottom: integer);
     procedure Paint(x, y, Loc, nx, ny, CityLoc, CityOwner: integer;
@@ -24 +24 @@
     procedure PaintCity(x, y: integer; const CityInfo: TCityInfo;
       accessory: boolean = true);
-    procedure BitBlt(Src: TBitmap; x, y, Width, Height, xSrc, ySrc,
+    procedure BitBlt(Src: TDpiBitmap; x, y, Width, Height, xSrc, ySrc,
       Rop: integer);
 
@@ -37 +37 @@
     procedure ShadeOutside(x0, y0, x1, y1, xm, ym: integer);
   protected
-    FOutput: TBitmap;
+    FOutput: TDpiBitmap;
     FLeft, FTop, FRight, FBottom, RealTop, RealBottom, AttLoc, DefLoc,
       DefHealth, FAdviceLoc: integer;
@@ -113 +113 @@
   BordersOK: integer;
   OnInitEnemyModel: TInitEnemyModelEvent;
-  LandPatch, OceanPatch, Borders: TBitmap;
+  LandPatch, OceanPatch, Borders: TDpiBitmap;
   TSpriteSize: array [0 .. TerrainIconLines * 9 - 1] of TRect;
   DebugMap: ^TTileList;
@@ -136 +136 @@
 var
   i, x, y, xSrc, ySrc, HGrTerrainNew, HGrCitiesNew, age, size: integer;
-  LandMore, OceanMore, DitherMask, Mask24: TBitmap;
+  LandMore, OceanMore, DitherMask, Mask24: TDpiBitmap;
   MaskLine: array [0 .. 32 * 3 - 1] of TPixelPointer; // 32 = assumed maximum for yyt
   Border: boolean;
@@ -165 +165 @@
   if LandPatch <> nil then
     LandPatch.Free;
-  LandPatch := TBitmap.Create;
+  LandPatch := TDpiBitmap.Create;
   LandPatch.PixelFormat := pf24bit;
   LandPatch.Canvas.Brush.Color := 0;
@@ -172 +172 @@
   if OceanPatch <> nil then
     OceanPatch.Free;
-  OceanPatch := TBitmap.Create;
+  OceanPatch := TDpiBitmap.Create;
   OceanPatch.PixelFormat := pf24bit;
   OceanPatch.Canvas.Brush.Color := 0;
   OceanPatch.SetSize(xxt * 8, yyt * 4);
   OceanPatch.Canvas.FillRect(0, 0, OceanPatch.Width, OceanPatch.Height);
-  LandMore := TBitmap.Create;
+  LandMore := TDpiBitmap.Create;
   LandMore.PixelFormat := pf24bit;
   LandMore.Canvas.Brush.Color := 0;
   LandMore.SetSize(xxt * 18, yyt * 9);
   LandMore.Canvas.FillRect(0, 0, LandMore.Width, LandMore.Height);
-  OceanMore := TBitmap.Create;
+  OceanMore := TDpiBitmap.Create;
   OceanMore.PixelFormat := pf24bit;
   OceanMore.Canvas.Brush.Color := 0;
   OceanMore.SetSize(xxt * 8, yyt * 4);
   OceanMore.Canvas.FillRect(0, 0, OceanMore.Width, OceanMore.Height);
-  DitherMask := TBitmap.Create;
+  DitherMask := TDpiBitmap.Create;
   DitherMask.PixelFormat := pf24bit;
   DitherMask.SetSize(xxt * 2, yyt * 2);
@@ -366 +366 @@
 
   // reduce size of terrain icons
-  Mask24 := TBitmap.Create;
+  Mask24 := TDpiBitmap.Create;
   Mask24.Assign(GrExt[HGrTerrain].Mask);
   Mask24.PixelFormat := pf24bit;
@@ -420 +420 @@
   if Borders <> nil then
     Borders.Free;
-  Borders := TBitmap.Create;
+  Borders := TDpiBitmap.Create;
   Borders.PixelFormat := pf24bit;
   Borders.SetSize(xxt * 2,(yyt * 2) * nPl);
@@ -452 +452 @@
 end;
 
-procedure TIsoMap.SetOutput(Output: TBitmap);
+procedure TIsoMap.SetOutput(Output: TDpiBitmap);
 begin
   FOutput := Output;
@@ -499 +499 @@
 end;
 
-procedure TIsoMap.BitBlt(Src: TBitmap; x, y, Width, Height, xSrc, ySrc,
+procedure TIsoMap.BitBlt(Src: TDpiBitmap; x, y, Width, Height, xSrc, ySrc,
   Rop: integer);
 begin