Changeset 254 for branches

Timestamp:

May 23, 2020, 12:55:52 AM (5 years ago)

Author:

chronos

Message:

• Fixed: Build DpiScrollDC under Linux.

Location:

branches/highdpi

Files:

• LocalPlayer/Term.pas (modified) (2 diffs)
• Packages/DpiControls/UDpiControls.pas (modified) (3 diffs)

branches/highdpi/LocalPlayer/Term.pas

@@ -4190 +4190 @@
     offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
     rec := Rect(0, 0, MapWidth, MapHeight);
-    DpiScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+    DpiScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
       rec, rec, 0, nil);
     for DoInvalidate := false to FastScrolling do
@@ -4197 +4197 @@
       begin
         rec.Bottom := MapHeight - overlap;
-        DpiScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
+        DpiScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
           rec, 0, nil);
         ProcessOptions := prInvalidate;

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -941 +941 @@
 function DpiBitBltCanvas(Dest: TDpiCanvas; X, Y, Width, Height: Integer; Src: TDpiCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
 function DpiCreateRectRgn(X1, Y1, X2, Y2: Integer): HRGN;
-function DpiScrollDC(hDC:HDC; dx:longint; dy:longint; const lprcScroll:RECT; const lprcClip:RECT;hrgnUpdate:HRGN; lprcUpdate: LPRECT): WINBOOL;
+function DpiScrollDC(Canvas: TDpiCanvas; dx: Longint; dy: Longint; const lprcScroll: TRect;
+  const lprcClip:TRect; hrgnUpdate: Handle; lprcUpdate: PRect): Boolean;
 function ScaleToNative(Value: Integer): Integer;
 function ScaleFromNative(Value: Integer): Integer;
@@ -984 +985 @@
 end;
 
-{$IFDEF LINUX}
-function LinuxScrollDC(Canvas: TDpiCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
-begin
-end;
-{$ENDIF}
-
-function DpiScrollDC(hDC: HDC; dx: longint; dy: longint;
-  const lprcScroll: RECT; const lprcClip: RECT; hrgnUpdate: HRGN;
-  lprcUpdate: LPRECT): WINBOOL;
+function DpiScrollDC(Canvas: TDpiCanvas; dx: Longint; dy: Longint;
+  const lprcScroll: TRect; const lprcClip: TRect; hrgnUpdate: Handle;
+  lprcUpdate: PRect): Boolean;
 begin
   {$IFDEF WINDOWS}
-  Result := Windows.ScrollDC(hDC, ScaleToNative(dx), ScaleToNative(dy),
+  Result := Windows.ScrollDC(Canvas.Handle, ScaleToNative(dx), ScaleToNative(dy),
     ScaleRectToNative(lprcScroll), ScaleRectToNative(lprcClip),
     hrgnUpdate, lprcUpdate);
@@ -1001 +996 @@
   {$IFDEF LINUX}
   // Can't do scrolling of DC under Linux, then fallback into BitBlt.
-  Result := DpiBitCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
+  Result := DpiBitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
     Canvas, lprcScroll.Left, lprcScroll.Top);
   {$ENDIF}