Changeset 246 for branches/highdpi/LocalPlayer/MessgEx.pas

Timestamp:

May 21, 2020, 8:17:38 PM (4 years ago)

Author:

chronos

Message:

• Modified: Update from trunk rev 245.
• Modified: Vcl prefix/suffix changed to Native.

File:

• branches/highdpi/LocalPlayer/MessgEx.pas (modified) (4 diffs)

branches/highdpi/LocalPlayer/MessgEx.pas

@@ -212 +212 @@
         Sleep(1);
         Ticks := NowPrecise;
-      until MovieCancelled or (MillisecondOf(Ticks - Ticks0) >= 1500);
+      until MovieCancelled or (Round((Ticks - Ticks0) / OneMillisecond) >= 1500);
       Hide;
     end;
@@ -237 +237 @@
   Screwed: array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of single;
   SrcPtr: TPixelPointer;
-begin
+  Width: Integer;
+  Height: Integer;
+begin
+  Width := 56;
+  Height := 40;
   if IconIndex >= 0 then begin
     xIcon := IconIndex mod 7 * xSizeBig;
     yIcon := (IconIndex + SystemIconLines * 7) div 7 * ySizeBig;
     // prepare screwed icon
-    fillchar(Screwed, sizeof(Screwed), 0);
+    FillChar(Screwed, sizeof(Screwed), 0);
     BigImp.BeginUpdate;
-    for iy := 0 to 39 do begin
-      for ix := 0 to 55 do begin
-        SrcPtr := PixelPointer(BigImp, ix + xIcon, iy + yIcon);
-        xR := ix * (37 + iy * 5 / 40) / 56;
+    SrcPtr := PixelPointer(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));
+    for iy := 0 to ScaleToNative(Height) - 1 do begin
+      for ix := 0 to ScaleToNative(Width) - 1 do begin
+        xR := ScaleFromNative(ix) * (37 + ScaleFromNative(iy) * 5 / Height) / Width;
         xDst := Trunc(xR);
         xR := Frac(xR);
-        x1 := (120 - ix) * (120 - ix) - 10000;
-        yR := iy * 18 / 40 + x1 * x1 / 4000000;
+        x1 := (120 - ScaleFromNative(ix)) * (120 - ScaleFromNative(ix)) - 10000;
+        yR := ScaleFromNative(iy) * 18 / Height + x1 * x1 / 4000000;
         yDst := Trunc(yR);
         yR := Frac(yR);
@@ -272 +276 @@
             Screwed[xDst + dx, yDst + dy, 3] := Screwed[xDst + dx, yDst + dy,
               3] + share;
-          end;
-      end;
+        end;
+        SrcPtr.NextPixel;
+      end;
+      SrcPtr.NextLine;
     end;
     BigImp.EndUpdate;
@@ -373 +379 @@
       begin
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
+        // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+        Buffer.Canvas.FillRect(0, 0, 1, 1);
         DpiBitCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
           ySizeBig + 2 * GlowRange, Canvas,