Changeset 736 for trunk

Timestamp:

Jan 20, 2026, 11:44:28 PM (21 hours ago)

Author:

chronos

Message:

• Fixed: Map drawing with Qt5 widgetset. Used slower software replacement of BitBlt function.

File:

• trunk/Packages/DpiControls/Dpi.Common.pas (modified) (4 diffs)

trunk/Packages/DpiControls/Dpi.Common.pas

@@ -26 +26 @@
   X, Y, cx, cy: Integer; uFlags: UINT): Boolean;
 function ScaleToNative(Value: Integer): Integer; inline;
-function ScaleToNativeDist(Base, Value: Integer): Integer;
-function ScaleFromNative(Value: Integer): Integer;
+function ScaleToNativeDist(Base, Value: Integer): Integer; inline;
+function ScaleFromNative(Value: Integer): Integer; inline;
 function ScalePointToNative(Value: TPoint): TPoint;
 function ScalePointFromNative(Value: TPoint): TPoint;
@@ -56 +56 @@
 end;
 
+function BitBltBitmapSimple(Dest: TBitmap; X, Y, Width, Height: Integer;
+  Src: TBitmap; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
+var
+  SrcPixel: TPixelPointer;
+  DstPixel: TPixelPointer;
+  XX, YY: Integer;
+begin
+  if XSrc < 0 then begin
+    X := X - XSrc;
+    Width := Width - XSrc;
+    XSrc := 0;
+  end;
+  if YSrc < 0 then begin
+    Y := Y - YSrc;
+    Height := Height - YSrc;
+    YSrc := 0;
+  end;
+
+  if X < 0 then begin
+    Width := Width + X;
+    XSrc := XSrc - X;
+    X := 0;
+  end;
+  if Y < 0 then begin
+    Height := Height + Y;
+    YSrc := YSrc - Y;
+    Y := 0;
+  end;
+  if (X + Width) >= Dest.Width then begin
+    Width := Dest.Width - X;
+  end;
+  if (Y + Height) >= Dest.Height then begin
+    Height := Dest.Height - Y;
+  end;
+  if (Width < 0) or (Height < 0) then begin
+    Result := True;
+    Exit;
+  end;
+
+  Dest.BeginUpdate;
+  SrcPixel := TPixelPointer.Create(Src.NativeBitmap, XSrc, YSrc);
+  DstPixel := TPixelPointer.Create(Dest.NativeBitmap, X, Y);
+  if Rop = SRCCOPY then begin
+    for YY := 0 to Height - 1 do begin
+      for XX := 0 to Width - 1 do begin
+        DstPixel.PixelRGB := SrcPixel.PixelARGB;
+        DstPixel.NextPixel;
+        SrcPixel.NextPixel;
+      end;
+      DstPixel.NextLine;
+      SrcPixel.NextLine;
+    end;
+  end else
+  if Rop = SRCPAINT then begin
+    for YY := 0 to Height - 1 do begin
+      for XX := 0 to Width - 1 do begin
+        DstPixel.PixelRGB := DstPixel.PixelRGB or SrcPixel.PixelARGB;
+        DstPixel.NextPixel;
+        SrcPixel.NextPixel;
+      end;
+      DstPixel.NextLine;
+      SrcPixel.NextLine;
+    end;
+  end else
+  if Rop = SRCAND then begin
+    for YY := 0 to Height - 1 do begin
+      for XX := 0 to Width - 1 do begin
+        DstPixel.PixelRGB := DstPixel.PixelRGB and SrcPixel.PixelARGB;
+        DstPixel.NextPixel;
+        SrcPixel.NextPixel;
+      end;
+      DstPixel.NextLine;
+      SrcPixel.NextLine;
+    end;
+  end else
+  if Rop = DSTINVERT then begin
+    for YY := 0 to Height - 1 do begin
+      for XX := 0 to Width - 1 do begin
+        DstPixel.PixelRGB := not DstPixel.PixelRGB;
+        DstPixel.NextPixel;
+      end;
+      DstPixel.NextLine;
+    end;
+  end else raise Exception.Create(SUnsupportedPaintOperationType);
+  Dest.EndUpdate;
+  Result := True;
+end;
+
 function BitBltBitmapPrecise(Dest: TBitmap; X, Y, Width, Height: Integer;
   Src: TBitmap; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY;
@@ -66 +154 @@
   DstPixelWidth, DstPixelHeight: Integer;
 begin
-  if not Precise or (Frac(ScreenInfo.Dpi / 96) = 0) then begin
+  if Frac(ScreenInfo.Dpi / 96) = 0 then begin
+    {$IF defined(LCLQT5)}
+    Result := BitBltBitmapSimple(Dest, X, Y, Width, Height, Src,
+      XSrc, YSrc, Rop);
+    {$ELSEIF defined(LCLQT6)}
+    Result := BitBltBitmapDirect(Dest, X, Y, Width, Height, Src,
+      XSrc, YSrc, Rop);
+    {$ELSE}
+    // Use faster non-fractional scaling
+    Result := BitBlt(Dest.Canvas.Handle, X, Y, Width, Height, Src.Canvas.Handle,
+      XSrc, YSrc, Rop);
+    {$ENDIF}
+    Exit;
+  end;
+
+  if not Precise then begin
+    {$IF defined(LCLQT5)}
+    {$ELSEIF defined(LCLQT6)}
+    {$ELSE}
     // Use faster non-fractional scaling
     Result := BitBlt(Dest.Canvas.Handle, X, Y, Width, Height, Src.Canvas.Handle,
       XSrc, YSrc, Rop);
     Exit;
+    {$ENDIF}
   end;
 
@@ -161 +268 @@
   if Rop = DSTINVERT then begin
     for YY := 0 to Height - 1 do begin
-      SrcPixel.SetXY(0, ScaleToNative(YSrc + YY));
       DstPixelHeight := ScaleToNative(Y + YY + 1) - ScaleToNative(Y + YY);
       for DstPixelY := 0 to DstPixelHeight - 1 do begin
         for XX := 0 to Width - 1 do begin
-          SrcPixel.SetX(ScaleToNative(XSrc + XX));
           DstPixelWidth := ScaleToNative(X + XX + 1) - ScaleToNative(X + XX);
           for DstPixelX := 0 to DstPixelWidth - 1 do begin