Changeset 210 for branches/highdpi/LocalPlayer/CityScreen.pas

Timestamp:

May 9, 2020, 4:02:07 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved HighDPI branch. Imported new changes from trunk branch.

File:

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

branches/highdpi/LocalPlayer/CityScreen.pas

@@ -5 +5 @@
 
 uses
-  {$IFDEF LINUX}
+  UDpiControls, {$IFDEF LINUX}
   LMessages,
   {$ENDIF}
-  Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin, UDpiControls,
+  Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
   ButtonA, ButtonC, Area, GraphType;
@@ -90 +90 @@
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories, Math;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, UPixelPointer, Sound;
 
 {$R *.lfm}
@@ -216 +216 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'City.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City.png', gfNoGamma);
   CityMapTemplate := TDpiBitmap.Create;
   CityMapTemplate.PixelFormat := pf24bit;
-  LoadGraphicFile(CityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'BigCityMap.png', gfNoGamma);
+  LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap.png', gfNoGamma);
   SmallCityMapTemplate := TDpiBitmap.Create;
   SmallCityMapTemplate.PixelFormat := pf24bit;
-  LoadGraphicFile(SmallCityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'SmallCityMap.png',
+  LoadGraphicFile(SmallCityMapTemplate, GetGraphicsDir + DirectorySeparator + 'SmallCityMap.png',
     gfNoGamma);
   SmallCityMap := TDpiBitmap.Create;
@@ -260 +260 @@
     Back.Canvas.FillRect(0, 0, ClientWidth, ClientHeight);
 
-    Dpibitblt(Back.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
-      MainTexture.Image.Canvas.Handle, 0, 0, SRCCOPY);
+    DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+      MainTexture.Image.Canvas, 0, 0);
     ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
   end;
@@ -291 +291 @@
   Color2 := Colors.Canvas.Pixels[clkAge0 + Age, cliHouse];
   SmallCityMap.Canvas.FillRect(0, 0, SmallCityMap.Width, SmallCityMap.Height);
-  Dpibitblt(SmallCityMap.Canvas.Handle, 0, 0, 83, hSmallMap,
-    SmallCityMapTemplate.Canvas.Handle, 83 * SizeClass, 0, SRCCOPY);
+  DpiBitCanvas(SmallCityMap.Canvas, 0, 0, 83, hSmallMap,
+    SmallCityMapTemplate.Canvas, 83 * SizeClass, 0);
   if IsPort then
   begin
-    Dpibitblt(SmallCityMap.Canvas.Handle, 83, 0, 15, hSmallMap,
-      SmallCityMapTemplate.Canvas.Handle, 332 + 15, 0, SRCCOPY);
+    DpiBitCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+      SmallCityMapTemplate.Canvas, 332 + 15, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, 83, hSmallMap, Color0, Color1, Color2);
     Color2 := Colors.Canvas.Pixels[clkCity, cliWater];
@@ -303 +303 @@
   else
   begin
-    Dpibitblt(SmallCityMap.Canvas.Handle, 83, 0, 15, hSmallMap,
-      SmallCityMapTemplate.Canvas.Handle, 332, 0, SRCCOPY);
+    DpiBitCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+      SmallCityMapTemplate.Canvas, 332, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, wSmallMap, hSmallMap, Color0,
       Color1, Color2);
@@ -311 +311 @@
   with SmallCityMap.Canvas do
   begin
-    brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
+    Brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
     for i := 0 to 29 do
     begin
@@ -359 +359 @@
   ZoomCityMap.Canvas.FillRect(0, 0, ZoomCityMap.Width, ZoomCityMap.Height);
 
-  Dpibitblt(ZoomCityMap.Canvas.Handle, 0, 0, wZoomMap, hZoomMap,
-    Back.Canvas.Handle, xZoomMap, yZoomMap, SRCCOPY);
+  DpiBitCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
+    Back.Canvas, xZoomMap, yZoomMap);
   if Mode = mImp then begin
     if ZoomArea < 3 then begin
@@ -442 +442 @@
     PixelPtr: TPixelPointer;
   begin
+    X := ScaleToVcl(X);
+    Y := ScaleToVcl(Y);
+    W := ScaleToVcl(W);
+    H := ScaleToVcl(H);
     Offscreen.BeginUpdate;
-    PixelPtr.Init(Offscreen, X, Y);
+    PixelPtr := PixelPointer(Offscreen, X, Y);
     for YY := 0 to H - 1 do begin
       for XX := 0 to W - 1 do begin
@@ -498 +502 @@
 
 var
-  x, y, xGr, i, i1, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
+  x, y, xGr, i, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
     HappyGain, OptiType, rx, ry, TrueFood, TrueProd, TruePoll: integer;
   av: integer;
@@ -542 +546 @@
   RedTex.clTextShade := $0000FF;
 
-  Dpibitblt(offscreen.Canvas.Handle, 0, 0, 640, 480, Back.Canvas.Handle, 0,
-    0, SRCCOPY);
-
-  offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  DpiBitCanvas(offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
+
+  Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
   RisedTextOut(offscreen.Canvas, 42, 7, Caption);
   with offscreen.Canvas do
@@ -558 +561 @@
     TextOut(8 + 14 - textwidth(s) div 2, 7, s);
   end;
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
 
   if not IsCityAlive then
@@ -614 +617 @@
     false, AllowChange and IsCityAlive and
     (c.Status and csResourceWeightsMask = 0));
-  Dpibitblt(offscreen.Canvas.Handle, xmArea + 102, 42, 90, 33, Back.Canvas.Handle,
-    xmArea + 102, 42, SRCCOPY);
+  DpiBitCanvas(offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
+    xmArea + 102, 42);
 
   if IsCityAlive then
@@ -645 +648 @@
     else
       xGr := 141;
-    Dpibitblt(offscreen.Canvas.Handle, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
-      27, 30, GrExt[HGrSystem].Mask.Canvas.Handle, xGr, 171, SRCAND); { shadow }
+    DpiBitCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
+      27, 30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea - 192 + 4 + i * d, ymArea - 96 - 30, 27,
       30, xGr, 171);
@@ -657 +660 @@
   begin
     xGr := 1 + 112;
-    Dpibitblt(offscreen.Canvas.Handle, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
-      30, GrExt[HGrSystem].Mask.Canvas.Handle, xGr, 171, SRCAND); { shadow }
+    DpiBitCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
+      30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea + 192 - 27 - i * d, 29, 27, 30,
       xGr, 171);
@@ -803 +806 @@
 
   // small map
-  Dpibitblt(offscreen.Canvas.Handle, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
-    SmallCityMap.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
+    SmallCityMap.Canvas, 0, 0);
   if Mode = mImp then
     Frame(offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
@@ -831 +834 @@
   Sprite(offscreen, HGrSystem, x + 6, y - 5, 10, 10, 154, 126);
 
-  Dpibitblt(offscreen.Canvas.Handle, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
-    ZoomCityMap.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(offscreen.Canvas, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
+    ZoomCityMap.Canvas, 0, 0);
 
   for i := 0 to 5 do
@@ -1620 +1623 @@
       with Canvas do
       begin
-        Dpibitblt(Canvas.Handle, xView + 5, yView + 1, 64, 2, Back.Canvas.Handle,
-          xView + 5, yView + 1, SRCCOPY);
-        Dpibitblt(Canvas.Handle, xView + 5, yView + 3, 2, 42, Back.Canvas.Handle,
-          xView + 5, yView + 3, SRCCOPY);
-        Dpibitblt(Canvas.Handle, xView + 5 + 62, yView + 3, 2, 42,
-          Back.Canvas.Handle, xView + 5 + 62, yView + 3, SRCCOPY);
+        DpiBitCanvas(Canvas, xView + 5, yView + 1, 64, 2, Back.Canvas,
+          xView + 5, yView + 1);
+        DpiBitCanvas(Canvas, xView + 5, yView + 3, 2, 42, Back.Canvas,
+          xView + 5, yView + 3);
+        DpiBitCanvas(Canvas, xView + 5 + 62, yView + 3, 2, 42,
+          Back.Canvas, xView + 5 + 62, yView + 3);
         ScreenTools.Frame(Canvas, xView + 9 - 1, yView + 5 - 1, xView + 9 + xSizeBig,
           yView + 5 + ySizeBig, $B0B0B0, $FFFFFF);
         RFrame(Canvas, xView + 9 - 2, yView + 5 - 2, xView + 9 + xSizeBig + 1,
           yView + 5 + ySizeBig + 1, $FFFFFF, $B0B0B0);
-        brush.Color := $000000;
+        Brush.Color := $000000;
         FillRect(Rect(xView + 9, yView + 5, xView + 1 + 72 - 8,
           yView + 5 + 40));
-        brush.style := bsClear;
+        Brush.style := bsClear;
       end
     else if BlinkTime = 6 then
@@ -1644 +1647 @@
       else if c.Project and cpImp = 0 then
       begin // project is unit
-        Dpibitblt(Canvas.Handle, xView + 9, yView + 5, xSizeBig, ySizeBig,
-          bigimp.Canvas.Handle, 0, 0, SRCCOPY);
+        DpiBitCanvas(Canvas, xView + 9, yView + 5, xSizeBig, ySizeBig,
+          Bigimp.Canvas, 0, 0);
         with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
           Sprite(Canvas, HGr, xView + 5, yView + 1, 64, 44, pix mod 10 * 65 + 1,