Changeset 210 for branches/highdpi/LocalPlayer/MessgEx.pas

Timestamp:

May 9, 2020, 4:02:07 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved HighDPI branch. Imported new changes from trunk branch.

File:

• branches/highdpi/LocalPlayer/MessgEx.pas (modified) (20 diffs)

branches/highdpi/LocalPlayer/MessgEx.pas

@@ -5 +5 @@
 
 uses
-  Messg, Protocol, ScreenTools, Platform, DateUtils, UDpiControls,
+  UDpiControls, Messg, Protocol, ScreenTools, Platform, DateUtils,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
   ButtonB, StdCtrls, DrawDlg;
@@ -73 +73 @@
 
 uses
-  ClientTools, BaseWin, Term, Help, UnitStat, Tribes,
-  IsoEngine, Diagram;
+  ClientTools, BaseWin, Term, Help, UnitStat, Tribes, UPixelPointer,
+  IsoEngine, Diagram, Sound;
 
 {$R *.lfm}
@@ -209 +209 @@
       Ticks0 := NowPrecise;
       repeat
-        Application.ProcessMessages;
+        DpiApplication.ProcessMessages;
         Sleep(1);
         Ticks := NowPrecise;
@@ -246 +246 @@
     for iy := 0 to 39 do begin
       for ix := 0 to 55 do begin
-        SrcPtr.Init(BigImp, ix + xIcon, iy + yIcon);
+        SrcPtr := PixelPointer(BigImp, ix + xIcon, iy + yIcon);
         xR := ix * (37 + iy * 5 / 40) / 56;
         xDst := Trunc(xR);
@@ -291 +291 @@
 
   // paint
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, wb, hb, ca, x, y, SRCCOPY);
+  DpiBitCanvas(LogoBuffer.Canvas, 0, 0, wb, hb, ca, x, y);
 
   if IconIndex >= 0 then
@@ -304 +304 @@
   ImageOp_BCC(LogoBuffer, Templates, 0, 0, xb, yb, wb, hb, clCover, clPage);
 
-  DpiBitBlt(ca.Handle, x, y, wb, hb, LogoBuffer.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(ca, x, y, wb, hb, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -328 +328 @@
       with MyRO.EnemyModel[emix], Tribe[Owner].ModelPicture[mix] do
       begin
-        DpiBitBlt(Canvas.Handle, x, y, 64, 48, GrExt[HGr].Mask.Canvas.Handle,
+        DpiBitCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Mask.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
-        DpiBitBlt(Canvas.Handle, x, y, 64, 48, GrExt[HGr].Data.Canvas.Handle,
+        DpiBitCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Data.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -345 +345 @@
         if UnitsInLine > LostUnitsPerLine then
           UnitsInLine := LostUnitsPerLine;
-      end
+      end;
     end;
 end;
@@ -371 +371 @@
       begin
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
-        DpiBitBlt(Buffer.Canvas.Handle, 0, 0, xSizeBig + 2 * GlowRange,
-          ySizeBig + 2 * GlowRange, Canvas.Handle,
-          ClientWidth div 2 - (28 + GlowRange), 24 - GlowRange, SRCCOPY);
-        DpiBitBlt(Buffer.Canvas.Handle, GlowRange, GlowRange, xSizeBig, ySizeBig,
-          BigImp.Canvas.Handle, IconIndex mod 7 * xSizeBig,
-          (IconIndex + SystemIconLines * 7) div 7 * ySizeBig, SRCCOPY);
+        DpiBitCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
+          ySizeBig + 2 * GlowRange, Canvas,
+          ClientWidth div 2 - (28 + GlowRange), 24 - GlowRange);
+        DpiBitCanvas(Buffer.Canvas, GlowRange, GlowRange, xSizeBig, ySizeBig,
+          BigImp.Canvas, IconIndex mod 7 * xSizeBig,
+          (IconIndex + SystemIconLines * 7) div 7 * ySizeBig);
         if p1 < 0 then
           GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig, $000000)
@@ -382 +382 @@
           GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig,
             Tribe[p1].Color);
-        DpiBitBlt(Canvas.Handle, ClientWidth div 2 - (28 + GlowRange),
+        DpiBitCanvas(Canvas, ClientWidth div 2 - (28 + GlowRange),
           24 - GlowRange, xSizeBig + 2 * GlowRange, ySizeBig + 2 * GlowRange,
-          Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+          Buffer.Canvas, 0, 0);
       end
       else
@@ -400 +400 @@
         FrameImage(Canvas, BigImp, ClientWidth div 2 - 28, 24, xSizeBig,
           ySizeBig, 0, 0);
-        DpiBitBlt(Canvas.Handle, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Mask.Canvas.Handle, pix mod 10 * 65 + 1,
+        DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+          GrExt[HGr].Mask.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCAND);
-        DpiBitBlt(Canvas.Handle, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Data.Canvas.Handle, pix mod 10 * 65 + 1,
+        DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+          GrExt[HGr].Data.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -415 +415 @@
         Frame(Canvas, ClientWidth div 2 - 32 - 1, 24 - 1,
           ClientWidth div 2 + 32, 24 + 48, $000000, $000000);
-        DpiBitBlt(Canvas.Handle, ClientWidth div 2 - 32, 24, 64, 48,
-          GrExt[Tribe[IconIndex].faceHGr].Data.Canvas.Handle,
+        DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 24, 64, 48,
+          GrExt[Tribe[IconIndex].faceHGr].Data.Canvas,
           1 + Tribe[IconIndex].facepix mod 10 * 65,
-          1 + Tribe[IconIndex].facepix div 10 * 49, SRCCOPY)
+          1 + Tribe[IconIndex].facepix div 10 * 49)
       end;
     mikPureIcon:
@@ -429 +429 @@
     mikEnemyShipComplete:
       begin
-        BitBltCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
-          (ClientWidth - 140) div 2, 24, SRCCOPY);
+        DpiBitCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
+          (ClientWidth - 140) div 2, 24);
         ImageOp_BCC(Buffer, Templates, 0, 0, 1, 279, 140, 120, 0, $FFFFFF);
-        DpiBitBlt(Canvas.Handle, (ClientWidth - 140) div 2, 24, 140, 120,
-          Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+        DpiBitCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120,
+          Buffer.Canvas, 0, 0);
       end;
     mikMyArmy:
@@ -450 +450 @@
   if OpenSound <> '' then
     PostMessage(Handle, WM_PLAYSOUND, 0, 0);
-end; { FormPaint }
+end;
 
 procedure TMessgExDlg.Button1Click(Sender: TObject);
@@ -469 +469 @@
 procedure TMessgExDlg.Button3Click(Sender: TObject);
 begin
-  ModalResult := mrCancel
+  ModalResult := mrCancel;
 end;
 
 procedure TMessgExDlg.RemoveBtnClick(Sender: TObject);
 begin
-  ModalResult := mrNo
+  ModalResult := mrNo;
 end;
 
@@ -485 +485 @@
       ModalResult := mrCancel
     else if Button2.Visible then
-      ModalResult := mrIgnore
+      ModalResult := mrIgnore;
 end;
 
@@ -497 +497 @@
     Kind := mkOk;
     ShowModal;
-  end
+  end;
 end;
 
@@ -522 +522 @@
     Kind := QueryKind;
     ShowModal;
-    result := ModalResult
-  end
+    result := ModalResult;
+  end;
 end;
 
@@ -537 +537 @@
     HelpNo := ContextNo;
     ShowModal;
-  end
+  end;
 end;
 
@@ -552 +552 @@
 end;
 
+
 initialization