Changeset 477 for trunk

Timestamp:

Dec 4, 2023, 11:33:25 PM (5 months ago)

Author:

chronos

Message:

• Fixed: Scaling on Windows.

Location:

trunk/Packages

Files:

• CevoComponents/ScreenTools.pas (modified) (1 diff)
• DpiControls/Dpi.Graphics.pas (modified) (1 diff)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -874 +874 @@
   {$IFDEF WINDOWS}
   // LCLIntf.BitBlt is slower than direct Windows BitBlt
-  Result := Windows.BitBlt(DestCanvas.Handle, X, Y, Width, Height, SrcCanvas.Handle, XSrc, YSrc, Rop);
+  Result := Windows.BitBlt(DestCanvas.Handle, ScaleToNative(X), ScaleToNative(Y),
+    ScaleToNative(Width), ScaleToNative(Height), SrcCanvas.Handle,
+    ScaleToNative(XSrc), ScaleToNative(YSrc), Rop);
   {$ELSE}
   Result := BitBlt(DestCanvas.Handle, X, Y, Width, Height, SrcCanvas.Handle, XSrc, YSrc, Rop);

trunk/Packages/DpiControls/Dpi.Graphics.pas

@@ -733 +733 @@
   try
     Bitmap.LoadFromFile(FileName);
-    Width := Bitmap.Width;
-    Height := Bitmap.Height;
+    if Self is TRasterImage then begin
+      TRasterImage(Self).SetSize(Bitmap.Width, Bitmap.Height);
+    end else begin
+      Width := Bitmap.Width;
+      Height := Bitmap.Height;
+    end;
     if Self is TCustomBitmap then begin
       StretchDrawBitmap(Graphics.TRasterImage(Bitmap),