Changeset 213 for branches

Timestamp:

May 9, 2020, 11:21:54 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Scale help watermark.

Location:

branches/highdpi

Files:

• LocalPlayer/Help.pas (modified) (2 diffs)
• Packages/DpiControls/UDpiControls.pas (modified) (4 diffs)

branches/highdpi/LocalPlayer/Help.pas

@@ -441 +441 @@
 const
   nHeaven = 28;
-  maxsum = 9 * 9 * 255 * 75 div 100;
+  MaxSum = 9 * 9 * 255 * 75 div 100;
 var
-  x, y, dx, dy, xSrc, ySrc, sum, xx: integer;
+  x, y, dx, dy, xSrc, ySrc, Sum, xx: integer;
   Heaven: array [0..nHeaven] of integer;
   PaintPtr: TPixelPointer;
@@ -458 +458 @@
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
-  for y := 0 to ySizeBig * 2 - 1 do
-    if ((y0 + y) >= 0) and ((y0 + y) < InnerHeight) then begin
-      PaintPtr := PixelPointer(OffScreen, 0, y0 + y);
-      CoalPtr := PixelPointer(Templates, 0, yCoal + y);
+  for y := 0 to ScaleToVcl(ySizeBig * 2) - 1 do
+    if ((ScaleToVcl(y0) + y) >= 0) and ((ScaleToVcl(y0) + y) < ScaleToVcl(InnerHeight)) then begin
+      PaintPtr := PixelPointer(OffScreen, 0, ScaleToVcl(y0) + y);
+      CoalPtr := PixelPointer(Templates, 0, ScaleToVcl(yCoal) + y);
       for dy := -1 to 1 do
-        if ((Max(y + dy, 0) shr 1) >= 0) and ((Max(y + dy, 0) shr 1) < ySizeBig) then
-          ImpPtr[dy] := PixelPointer(BigImp, 0, ySrc + (Max(y + dy, 0) shr 1));
-      for x := 0 to xSizeBig * 2 - 1 do begin
-        sum := 0;
+        if ((Max(y + ScaleToVcl(dy), 0) shr 1) >= 0) and ((Max(y + ScaleToVcl(dy), 0) shr 1) < ScaleToVcl(ySizeBig)) then
+          ImpPtr[dy] := PixelPointer(BigImp, 0, ScaleToVcl(ySrc) + (Max(y + ScaleToVcl(dy), 0) shr 1));
+      for x := 0 to ScaleToVcl(xSizeBig * 2) - 1 do begin
+        Sum := 0;
         for dx := -1 to 1 do begin
-          xx := xSrc + Max((x + dx), 0) shr 1;
+          xx := ScaleToVcl(xSrc) + Max((x + ScaleToVcl(dx)), 0) shr 1;
           for dy := -1 to 1 do begin
             ImpPtr[dy].SetX(xx);
-            if ((y + dy) shr 1 < 0) or ((y + dy) shr 1 >= ySizeBig) or
-              ((x + dx) shr 1 < 0) or ((x + dx) shr 1 >= xSizeBig) or
-              ((y + dy) shr 1 < nHeaven) and
+            if ((y + ScaleToVcl(dy)) shr 1 < 0) or ((y + ScaleToVcl(dy)) shr 1 >= ScaleToVcl(ySizeBig)) or
+              ((x + ScaleToVcl(dx)) shr 1 < 0) or ((x + ScaleToVcl(dx)) shr 1 >= ScaleToVcl(xSizeBig)) or
+              ((y + ScaleToVcl(dy)) shr 1 < ScaleToVcl(nHeaven)) and
               (ImpPtr[dy].Pixel^.B shl 16 + ImpPtr[dy].Pixel^.G shl 8 +
-              ImpPtr[dy].Pixel^.R = Heaven[(y + dy) shr 1]) then
-              sum := sum + 9 * 255
+              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromVcl(y) + dy) shr 1]) then
+              Sum := Sum + 9 * 255
             else
-              sum := sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
+              Sum := Sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
                 ImpPtr[dy].Pixel^.R;
           end;
         end;
-        if sum < maxsum then begin // no saturation
-          CoalPtr.SetX(xCoal + x);
-          sum := 1 shl 22 - (maxsum - sum) * (256 - CoalPtr.Pixel^.B * 2);
+        if Sum < MaxSum then begin // no saturation
+          CoalPtr.SetX(ScaleToVcl(xCoal) + x);
+          Sum := 1 shl 22 - (MaxSum - Sum) * (256 - CoalPtr.Pixel^.B * 2);
           PaintPtr.SetX(x0 + x);
-          PaintPtr.Pixel^.B := PaintPtr.Pixel^.B * sum shr 22;
-          PaintPtr.Pixel^.G := PaintPtr.Pixel^.G * sum shr 22;
-          PaintPtr.Pixel^.R := PaintPtr.Pixel^.R * sum shr 22;
+          PaintPtr.Pixel^.B := PaintPtr.Pixel^.B * Sum shr 22;
+          PaintPtr.Pixel^.G := PaintPtr.Pixel^.G * Sum shr 22;
+          PaintPtr.Pixel^.R := PaintPtr.Pixel^.R * Sum shr 22;
         end;
       end;

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -710 +710 @@
     constructor Create;
     destructor Destroy; override;
+    procedure UpdateScreen;
     property FormCount: Integer read GetFormCount;
     property Forms[Index: Integer]: TDpiForm read GetForms;
@@ -1042 +1043 @@
 begin
   GetVclApplication.Initialize;
+  DpiScreen.UpdateScreen;
 end;
 
@@ -2172 +2174 @@
   FForms := TDpiForms.Create;
   FForms.FreeObjects := False;
-  Dpi := Round(96 * 2); //Screen.PixelsPerInch;
+  // Screen.PixelsPerInch is not initialized at this point
+  Dpi := 96;
 end;
 
@@ -2179 +2182 @@
   FreeAndNil(FForms);
   inherited Destroy;
+end;
+
+procedure TDpiScreen.UpdateScreen;
+begin
+  Dpi := Screen.PixelsPerInch;
 end;