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

branches/highdpi/LocalPlayer/TechTree.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, Messg, LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics,
-  Controls, Forms, ButtonBase, ButtonB, DrawDlg, UDpiControls;
+  UDpiControls, ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Controls, Forms, ButtonB, DrawDlg;
 
 type
@@ -30 +30 @@
   TechTreeDlg: TTechTreeDlg;
 
+
 implementation
 
@@ -77 +78 @@
   X, w: Integer;
 begin
-  with Canvas do
-  begin
+  with Canvas do begin
     // black border
     brush.color := $000000;
@@ -107 +107 @@
         -BlackBorder - yOffset, Paper);
   end;
-  DpiBitBlt(Canvas.Handle, max(BlackBorder, BlackBorder + xOffset),
+  DpiBitCanvas(Canvas, max(BlackBorder, BlackBorder + xOffset),
     max(BlackBorder, BlackBorder + yOffset),
     min(Image.width, min(Image.width + xOffset,
@@ -113 +113 @@
     ), min(Image.height, min(Image.height + yOffset,
     min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
-    yOffset))), Image.Canvas.Handle, max(0, -xOffset),
-    max(0, -yOffset), SRCCOPY);
+    yOffset))), Image.Canvas, max(0, -xOffset),
+    max(0, -yOffset));
 end;
 
 procedure TTechTreeDlg.FormShow(Sender: TObject);
 var
-  X, Y, ad, TexWidth, TexHeight: Integer;
+  X, Y, ad: Integer;
   s: string;
-  SrcPixel, DstPixel: TPixelPointer;
-begin
-  if Image = nil then
-  begin
+const
+  TransparentColor = $7F007F;
+begin
+  if Image = nil then begin
     Image := TDpiBitmap.Create;
     Image.PixelFormat := pf24bit;
     LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png', gfNoGamma);
 
-    with Image.Canvas do
-    begin
+    with Image.Canvas do begin
       // write advance names
       Font.Assign(UniFont[ftSmall]);
@@ -146 +145 @@
             TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, s);
             Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1]
-              := $7F007F;
+              := TransparentColor;
           end
         end;
@@ -161 +160 @@
     end;
 
-    // texturize background
-    Image.BeginUpdate;
-    TexWidth := Paper.Width;
-    TexHeight := Paper.Height;
-    DstPixel.Init(Image);
-    SrcPixel.Init(Paper);
-    for Y := 0 to Image.Height - 1 do begin
-      for X := 0 to Image.Width - 1 do begin
-        if (DstPixel.Pixel^.ARGB and $FFFFFF) = $7F007F then begin // transparent
-          SrcPixel.SetXY(X mod TexWidth, Y mod TexHeight);
-          DstPixel.Pixel^.B := SrcPixel.Pixel^.B;
-          DstPixel.Pixel^.G := SrcPixel.Pixel^.G;
-          DstPixel.Pixel^.R := SrcPixel.Pixel^.R;
-        end;
-        DstPixel.NextPixel;
-      end;
-      DstPixel.NextLine;
-    end;
-    Image.EndUpdate;
+    Texturize(Image, Paper, TransparentColor);
   end;
 
@@ -204 +185 @@
     xDown := X;
     yDown := Y;
-  end
+  end;
 end;
 
@@ -234 +215 @@
 
     SmartInvalidate;
-  end
+  end;
 end;
 
@@ -246 +227 @@
 procedure TTechTreeDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close();
+  Close;
 end;