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

branches/highdpi/LocalPlayer/Draft.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, BaseWin, UDpiControls,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
+
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
   ButtonA,
@@ -91 +92 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'MiliRes.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes.png', gfNoGamma);
 end;
 
@@ -238 +239 @@
   // assemble background from 2 texture tiles
   begin
-    Dpibitblt(Back.Canvas.Handle, 0, 0, ClientWidth, 64,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
-      hMainTexture - 64, SRCCOPY);
-    Dpibitblt(Back.Canvas.Handle, 0, 64, ClientWidth, ClientHeight - 64,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
-      0, SRCCOPY);
+    DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, 64,
+      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
+      hMainTexture - 64);
+    DpiBitCanvas(Back.Canvas, 0, 64, ClientWidth, ClientHeight - 64,
+      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
+      0);
   end
   else
-    Dpibitblt(Back.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
-      (hMainTexture - ClientHeight) div 2, SRCCOPY);
+    DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
+      (hMainTexture - ClientHeight) div 2);
   ImageOp_B(Back, Template, 0, 0, 0, 0, Template.Width, 64);
   ImageOp_B(Back, Template, 0, 64, 0, 64 + Cut, Template.Width,
     Template.Height - 64 - Cut);
 
-  Dpibitblt(offscreen.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
-    Back.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+    Back.Canvas, 0, 0);
 
   offscreen.Canvas.Font.Assign(UniFont[ftCaption]);