Changeset 475 for trunk

Timestamp:

Dec 4, 2023, 9:42:30 PM (5 months ago)

Author:

chronos

Message:

• Fixed: Build under Windows.

Location:

trunk

Files:

• Integrated.lpi (modified) (3 diffs)
• LocalPlayer/Term.pas (modified) (2 diffs)
• Packages/DpiControls/Dpi.Common.pas (modified) (3 diffs)

trunk/Integrated.lpi

@@ -17 +17 @@
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True"/>
+      </XPManifest>
       <Icon Value="0"/>
       <Resources Count="2">
@@ -70 +73 @@
               <IgnoredMessages idx5024="True"/>
             </CompilerMessages>
-            <OtherDefines Count="1">
-              <Define0 Value="DPI"/>
-            </OtherDefines>
+            <CustomOptions Value="-dDPI"/>
           </Other>
         </CompilerOptions>
@@ -78 +79 @@
       <SharedMatrixOptions Count="2">
         <Item1 ID="151739052537" Targets="CevoComponents,Common,DpiControls" Modes="Debug" Value="-g -gl -gh -O1 -dDPI"/>
-        <Item2 ID="186701832267" Targets="CevoComponents,Common,DpiControls" Modes="Release" Value="-CX -XX -O3"/>
+        <Item2 ID="186701832267" Targets="CevoComponents,Common,DpiControls" Modes="Release" Value="-CX -XX -O3 -dDPI"/>
       </SharedMatrixOptions>
     </BuildModes>

trunk/LocalPlayer/Term.pas

@@ -7168 +7168 @@
       WindowState := CurrentWindowState;
       {$IFDEF WINDOWS}
-      BorderStyle := bsNone;
+      BorderStyle := TBorderStyle.bsNone;
       {$ENDIF}
       BorderIcons := [];
@@ -7183 +7183 @@
       end;
       {$IFDEF WINDOWS}
-      BorderStyle := bsSizeable;
+      BorderStyle := TBorderStyle.bsSizeable;
       {$ENDIF}
       BorderIcons := [TBorderIcon.biSystemMenu, TBorderIcon.biMinimize,

trunk/Packages/DpiControls/Dpi.Common.pas

@@ -4 +4 @@
 
 uses
+  {$IFDEF WINDOWS}Windows,{$ENDIF}
   Classes, SysUtils, LCLType, Types, LCLIntf, Graphics, Dpi.Graphics;
 
@@ -9 +10 @@
   DpiControlsComponentPaletteName = 'DpiControls';
 
-function BitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
-function BitBltCanvas(Dest: TCanvas; X, Y, Width, Height: Integer; Src: TCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
+function BitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc,
+    YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
+function BitBltCanvas(Dest: TCanvas; X, Y, Width, Height: Integer; Src: TCanvas;
+    XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
 function CreateRectRgn(X1, Y1, X2, Y2: Integer): HRGN;
+function ScrollDC(hDC: HDC; dx: longint; dy: longint; const lprcScroll: RECT;
+  const lprcClip:RECT;hrgnUpdate:HRGN; lprcUpdate: LPRECT): WINBOOL; overload;
 function ScrollDC(Canvas: TCanvas; dx: Longint; dy: Longint; const lprcScroll: TRect;
-  const lprcClip:TRect; hrgnUpdate: Handle; lprcUpdate: PRect): Boolean;
+  const lprcClip:TRect; hrgnUpdate: Handle; lprcUpdate: PRect): Boolean; overload;
 function ScaleToNative(Value: Integer): Integer;
 function ScaleToNativeDist(Base, Value: Integer): Integer;
@@ -44 +49 @@
   Result := LCLIntf.CreateRectRgn(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2),
     ScaleToNative(Y2));
+end;
+
+function ScrollDC(hDC: HDC; dx: longint; dy: longint; const lprcScroll: RECT;
+  const lprcClip: RECT; hrgnUpdate: HRGN; lprcUpdate: LPRECT): WINBOOL;
+var
+  R: RECT;
+begin
+  if Assigned(lprcUpdate) then begin
+    R := ScaleRectToNative(lprcUpdate^);
+    lprcUpdate := @R;
+  end;
+  Result := Windows.ScrollDC(hDC, ScaleToNative(dx), ScaleToNative(dY),
+    ScaleRectToNative(lprcScroll), ScaleRectToNative(lprcClip), hrgnUpdate, lprcUpdate);
 end;