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

Timestamp:

Apr 6, 2021, 8:11:02 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

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

branches/highdpi/LocalPlayer/MessgEx.pas

@@ -149 +149 @@
       begin
         Tribe[IconIndex].InitAge(GetAge(IconIndex));
-        if Tribe[IconIndex].faceHGr >= 0 then
-          TopSpace := 64
+        if Assigned(Tribe[IconIndex].faceHGr) then
+          TopSpace := 64;
       end;
     mikFullControl:
@@ -233 +233 @@
   hScrewed = 27;
 var
-  ix, iy, xDst, yDst, dx, dy, xIcon, yIcon, xb, yb, wb, hb: integer;
+  ix, iy, xDst, yDst, dx, dy, xIcon, yIcon: integer;
+  BookRect: TRect;
   x1, xR, yR, share: single;
   Screwed: array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of single;
@@ -282 +283 @@
     end;
     BigImp.EndUpdate;
-    xb := xBBook;
-    yb := yBBook;
-    wb := wBBook;
-    hb := hBBook;
+    BookRect := BigBook.BoundsRect;
   end
   else
   begin
-    xb := xSBook;
-    yb := ySBook;
-    wb := wSBook;
-    hb := hSBook;
-  end;
-  x := x - wb div 2;
+    BookRect := SmallBook.BoundsRect;
+  end;
+  x := x - BookRect.Width div 2;
 
   // paint
-  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
-  DpiBitCanvas(LogoBuffer.Canvas, 0, 0, wb, hb, ca, x, y);
+  UnshareBitmap(LogoBuffer);
+  DpiBitCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, x, y);
 
   if IconIndex >= 0 then
@@ -310 +304 @@
             Trunc(Screwed[ix, iy, 0] / Screwed[ix, iy, 3]) shl 16;
 
-  ImageOp_BCC(LogoBuffer, Templates, 0, 0, xb, yb, wb, hb, clCover, clPage);
-
-  DpiBitCanvas(ca, x, y, wb, hb, LogoBuffer.Canvas, 0, 0);
+  ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), BookRect, clCover, clPage);
+
+  DpiBitCanvas(ca, x, y, BookRect.Width, BookRect.Height, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -336 +330 @@
       with MyRO.EnemyModel[emix], Tribe[Owner].ModelPicture[mix] do
       begin
-        DpiBitCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Mask.Canvas,
+        DpiBitCanvas(Canvas, x, y, 64, 48, HGr.Mask.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
-        DpiBitCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Data.Canvas,
+        DpiBitCanvas(Canvas, x, y, 64, 48, HGr.Data.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -379 +373 @@
       begin
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
-        // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-        Buffer.Canvas.FillRect(0, 0, 1, 1);
+        UnshareBitmap(Buffer);
         DpiBitCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
           ySizeBig + 2 * GlowRange, Canvas,
@@ -411 +404 @@
           ySizeBig, 0, 0);
         DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Mask.Canvas, pix mod 10 * 65 + 1,
+          HGr.Mask.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCAND);
         DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Data.Canvas, pix mod 10 * 65 + 1,
+          HGr.Data.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -421 +414 @@
         MainTexture.clCover);
     mikTribe:
-      if Tribe[IconIndex].faceHGr >= 0 then
+      if Assigned(Tribe[IconIndex].faceHGr) then
       begin
         Frame(Canvas, ClientWidth div 2 - 32 - 1, 24 - 1,
           ClientWidth div 2 + 32, 24 + 48, $000000, $000000);
         DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 24, 64, 48,
-          GrExt[Tribe[IconIndex].faceHGr].Data.Canvas,
+          Tribe[IconIndex].faceHGr.Data.Canvas,
           1 + Tribe[IconIndex].facepix mod 10 * 65,
           1 + Tribe[IconIndex].facepix div 10 * 49)
@@ -441 +434 @@
         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);
+        ImageOp_BCC(Buffer, Templates.Data, Point(0, 0), StarshipDeparted.BoundsRect, 0, $FFFFFF);
         DpiBitCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120,
           Buffer.Canvas, 0, 0);