Changeset 210 for branches/highdpi/LocalPlayer/CityType.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/CityType.pas (modified) (8 diffs)

branches/highdpi/LocalPlayer/CityType.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, BaseWin, LCLIntf, LCLType,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin, LCLIntf, LCLType,
   SysUtils, Classes, Graphics, Controls, Forms,
   ButtonB, ExtCtrls;
@@ -39 +39 @@
   CityTypeDlg: TCityTypeDlg;
 
-
 implementation
 
-uses
-  Help, UDpiControls;
+uses Help;
 
 {$R *.lfm}
@@ -116 +114 @@
         xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.clBevelLight,
         MainTexture.clBevelShade);
-    DpiBitBlt(offscreen.Canvas.Handle, xSwitch + 2 + i * 42, ySwitch + 2,
-      xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle, (i + 3) * xSizeSmall,
-      0, SRCCOPY)
+    DpiBitCanvas(offscreen.Canvas, xSwitch + 2 + i * 42, ySwitch + 2,
+      xSizeSmall, ySizeSmall, SmallImp.Canvas, (i + 3) * xSizeSmall, 0);
   end;
   RisedTextOut(offscreen.Canvas, 8, yList + 32 * nListRow + 2,
@@ -151 +148 @@
       yList + 16 + ySizeSmall div 2 + i div nListCol * 32,
       MainTexture.clBevelLight, MainTexture.clBevelShade);
-    DpiBitBlt(offscreen.Canvas.Handle, xList + 21 - xSizeSmall div 2 +
+    DpiBitCanvas(offscreen.Canvas, xList + 21 - xSizeSmall div 2 +
       i mod nListCol * 42, yList + 16 - ySizeSmall div 2 + i div nListCol * 32,
-      xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+      xSizeSmall, ySizeSmall, SmallImp.Canvas,
       MyData.ImpOrder[ctype, i] mod 7 * xSizeSmall,
       (MyData.ImpOrder[ctype, i] + SystemIconLines * 7) div 7 *
-      ySizeSmall, SRCCOPY);
+      ySizeSmall);
     inc(i);
   end;
@@ -174 +171 @@
         nPool div nPoolCol * 32, MainTexture.clBevelLight,
         MainTexture.clBevelShade);
-      DpiBitBlt(offscreen.Canvas.Handle, xPool + 21 - xSizeSmall div 2 +
+      DpiBitCanvas(offscreen.Canvas, xPool + 21 - xSizeSmall div 2 +
         nPool mod nPoolCol * 42, yPool + 16 - ySizeSmall div 2 +
-        nPool div nPoolCol * 32, xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+        nPool div nPoolCol * 32, xSizeSmall, ySizeSmall, SmallImp.Canvas,
         iix mod 7 * xSizeSmall, (iix + SystemIconLines * 7) div 7 *
-        ySizeSmall, SRCCOPY);
-      inc(nPool)
+        ySizeSmall);
+      inc(nPool);
     end;
   DeleteBtn.Visible := MyData.ImpOrder[ctype, 0] >= 0;
@@ -254 +251 @@
     begin
       dragiix := MyData.ImpOrder[ctype, i];
-      Screen.Cursor := crImpDrag;
+      DpiScreen.Cursor := crImpDrag;
       SmartUpdateContent
     end;
@@ -270 +267 @@
     begin
       dragiix := Pooliix[i];
-      Screen.Cursor := crImpDrag;
+      DpiScreen.Cursor := crImpDrag;
       SmartUpdateContent
     end;
@@ -332 +329 @@
     SmartUpdateContent
   end;
-  Screen.Cursor := crDefault
+  DpiScreen.Cursor := crDefault
 end;