Changeset 179 for branches/highdpi/LocalPlayer/Term.pas

Timestamp:

Jun 23, 2019, 9:12:54 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved scaling support.

File:

• branches/highdpi/LocalPlayer/Term.pas (modified) (14 diffs)

branches/highdpi/LocalPlayer/Term.pas

@@ -2746 +2746 @@
           begin
             if AILogo[pLogo] <> nil then
-              BitBlt(Canvas.Handle, (xRightPanel + 10) - (16 + 64),
+              DpiBitBlt(Canvas.Handle, (xRightPanel + 10) - (16 + 64),
                 ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas.Handle,
                 0, 0, SRCCOPY);
@@ -4042 +4042 @@
   begin
     if xMap < 0 then
-      BitBlt(Canvas.Handle, MapOffset, TopBarHeight, width + xMap,
+      DpiBitBlt(Canvas.Handle, MapOffset, TopBarHeight, width + xMap,
         height + yMap, Buffer.Canvas.Handle, -xMap, -yMap, SRCCOPY)
     else
-      BitBlt(Canvas.Handle, xMap + MapOffset, TopBarHeight, width,
+      DpiBitBlt(Canvas.Handle, xMap + MapOffset, TopBarHeight, width,
         height + yMap, Buffer.Canvas.Handle, 0, -yMap, SRCCOPY)
   end
@@ -4051 +4051 @@
   begin
     if xMap < 0 then
-      BitBlt(Canvas.Handle, MapOffset, TopBarHeight + yMap, width + xMap,
+      DpiBitBlt(Canvas.Handle, MapOffset, TopBarHeight + yMap, width + xMap,
         height, Buffer.Canvas.Handle, -xMap, 0, SRCCOPY)
     else
-      BitBlt(Canvas.Handle, xMap + MapOffset, TopBarHeight + yMap, width,
+      DpiBitBlt(Canvas.Handle, xMap + MapOffset, TopBarHeight + yMap, width,
         height, Buffer.Canvas.Handle, 0, 0, SRCCOPY);
   end
@@ -4325 +4325 @@
 procedure TMainScreen.CopyMiniToPanel;
 begin
-  BitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+  DpiBitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
     Mini.Canvas.Handle, 0, 0, SRCCOPY);
   if MarkCityLoc >= 0 then
@@ -4414 +4414 @@
           ClientWidth - xPalace + xSizeBig + 1, yPalace + ySizeBig + 1,
           $FFFFFF, $B0B0B0);
-        BitBlt(Panel.Canvas.Handle, ClientWidth - xPalace, yPalace, xSizeBig,
+        DpiBitBlt(Panel.Canvas.Handle, ClientWidth - xPalace, yPalace, xSizeBig,
           ySizeBig, GrExt[HGrSystem2].Data.Canvas.Handle, 70, 123, SRCCOPY);
       end
@@ -5272 +5272 @@
       PaintLoc(MouseLoc, 2);
       MiniPaint;
-      BitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+      DpiBitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
         Mini.Canvas.Handle, 0, 0, SRCCOPY);
       if ywmax <= 0 then
@@ -6096 +6096 @@
     for Step := 0 to abs(Step1 - Step0) do
     begin
-      BitBlt(Buffer.Canvas.Handle, 0, 0, xRange, yRange,
+      DpiBitBlt(Buffer.Canvas.Handle, 0, 0, xRange, yRange,
         offscreen.Canvas.Handle, xMin, yMin, SRCCOPY);
       if Step1 <> Step0 then
@@ -6138 +6138 @@
   if Restore then
   begin
-    BitBlt(Buffer.Canvas.Handle, 0, 0, xRange, yRange, offscreen.Canvas.Handle,
+    DpiBitBlt(Buffer.Canvas.Handle, 0, 0, xRange, yRange, offscreen.Canvas.Handle,
       xMin, yMin, SRCCOPY);
     PaintBufferToScreen(xMin, yMin, xRange, yRange);
@@ -7489 +7489 @@
   InitPopup(Popup);
   if FullScreen then
-    Popup.Popup(Left + TControl(Sender).Left, Top + TControl(Sender).Top)
+    Popup.Popup(Left + TDpiControl(Sender).Left, Top + TDpiControl(Sender).Top)
   else
-    Popup.Popup(Left + TControl(Sender).Left + 4, Top + TControl(Sender).Top +
+    Popup.Popup(Left + TDpiControl(Sender).Left + 4, Top + TDpiControl(Sender).Top +
       GetSystemMetrics(SM_CYCAPTION) + 4);
 end;
@@ -7553 +7553 @@
           yw := ywmax;
       end;
-      BitBlt(Buffer.Canvas.Handle, 0, 0, G.lx * 2, G.ly, Mini.Canvas.Handle, 0,
+      DpiBitBlt(Buffer.Canvas.Handle, 0, 0, G.lx * 2, G.ly, Mini.Canvas.Handle, 0,
         0, SRCCOPY);
       if ywmax <= 0 then
@@ -7563 +7563 @@
           x - xMini - 2 + MapWidth div (xxt * 2) - 1, yw + MapHeight div yyt -
           2, MainTexture.clMark, MainTexture.clMark);
-      BitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+      DpiBitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
         Buffer.Canvas.Handle, 0, 0, SRCCOPY);
       MainOffscreenPaint;
@@ -7715 +7715 @@
       Brush.Style := bsClear;
     end;
-  BitBlt(Canvas.Handle, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
+  DpiBitBlt(Canvas.Handle, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
     offscreen.Canvas.Handle, 0, 0, SRCCOPY);
-  BitBlt(Canvas.Handle, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas.Handle,
+  DpiBitBlt(Canvas.Handle, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas.Handle,
     0, 0, SRCCOPY);
   if xMidPanel > MapOffset then
-    BitBlt(Canvas.Handle, xMidPanel, TopBarHeight + MapHeight - overlap,
+    DpiBitBlt(Canvas.Handle, xMidPanel, TopBarHeight + MapHeight - overlap,
       ClientWidth div 2 - xMidPanel, overlap, offscreen.Canvas.Handle,
       xMidPanel - MapOffset, MapHeight - overlap, SRCCOPY)
   else
-    BitBlt(Canvas.Handle, MapOffset, TopBarHeight + MapHeight - overlap,
+    DpiBitBlt(Canvas.Handle, MapOffset, TopBarHeight + MapHeight - overlap,
       ClientWidth div 2 - MapOffset, overlap, offscreen.Canvas.Handle, 0,
       MapHeight - overlap, SRCCOPY);
   if xRightPanel < MapOffset + MapWidth then
-    BitBlt(Canvas.Handle, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
+    DpiBitBlt(Canvas.Handle, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
       xRightPanel - ClientWidth div 2, overlap, offscreen.Canvas.Handle,
       ClientWidth div 2 - MapOffset, MapHeight - overlap, SRCCOPY)
   else
-    BitBlt(Canvas.Handle, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
+    DpiBitBlt(Canvas.Handle, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
       MapOffset + MapWidth - ClientWidth div 2, overlap,
       offscreen.Canvas.Handle, ClientWidth div 2 - MapOffset,
       MapHeight - overlap, SRCCOPY);
-  BitBlt(Canvas.Handle, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
+  DpiBitBlt(Canvas.Handle, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
     overlap, Panel.Canvas.Handle, 0, 0, SRCCOPY);
-  BitBlt(Canvas.Handle, xRightPanel, TopBarHeight + MapHeight - overlap,
+  DpiBitBlt(Canvas.Handle, xRightPanel, TopBarHeight + MapHeight - overlap,
     Panel.width - xRightPanel, overlap, Panel.Canvas.Handle, xRightPanel,
     0, SRCCOPY);
-  BitBlt(Canvas.Handle, 0, TopBarHeight + MapHeight, Panel.width,
+  DpiBitBlt(Canvas.Handle, 0, TopBarHeight + MapHeight, Panel.width,
     PanelHeight - overlap, Panel.Canvas.Handle, 0, overlap, SRCCOPY);
   if (pLogo >= 0) and (G.RO[pLogo] = nil) and (AILogo[pLogo] <> nil) then
-    BitBlt(Canvas.Handle, xRightPanel + 10 - (16 + 64),
+    DpiBitBlt(Canvas.Handle, xRightPanel + 10 - (16 + 64),
       ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas.Handle, 0,
       0, SRCCOPY);
@@ -7753 +7753 @@
   r0: HRgn;
 begin
-  r0 := CreateRectRgn(Left, Top, Rigth, Bottom);
+  r0 := DpiCreateRectRgn(Left, Top, Rigth, Bottom);
   InvalidateRgn(Handle, r0, false);
   DeleteObject(r0);
@@ -7763 +7763 @@
   r0, r1: HRgn;
 begin
-  r0 := CreateRectRgn(Left, Top, Rigth, Bottom);
+  r0 := DpiCreateRectRgn(Left, Top, Rigth, Bottom);
   for i := 0 to ControlCount - 1 do
     if not(Controls[i] is TArea) and Controls[i].Visible then
     begin
       with Controls[i].BoundsRect do
-        r1 := CreateRectRgn(Left, Top, Right, Bottom);
+        r1 := DpiCreateRectRgn(Left, Top, Right, Bottom);
       CombineRgn(r0, r0, r1, RGN_DIFF);
       DeleteObject(r1);