Changeset 316 for trunk/Packages

Timestamp:

Mar 18, 2021, 11:31:20 PM (4 years ago)

Author:

chronos

Message:

• Modified: Some Templates items used as TGraphicSetItem.

File:

• trunk/Packages/CevoComponents/ScreenTools.pas (modified) (8 diffs)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -49 +49 @@
 procedure MakeRed(Dst: TBitmap; X, Y, Width, Height: Integer);
 procedure ImageOp_B(dst, Src: TBitmap; xDst, yDst, xSrc, ySrc, Width, Height: Integer);
-procedure ImageOp_BCC(dst, Src: TBitmap;
-  xDst, yDst, xSrc, ySrc, Width, Height, Color1, Color2: Integer);
+procedure ImageOp_BCC(Dst, Src: TBitmap;
+  xDst, yDst, xSrc, ySrc, Width, Height, Color1, Color2: Integer); overload;
+procedure ImageOp_BCC(Dst, Src: TBitmap;
+  DstPos: TPoint; SrcRect: TRect; Color1, Color2: Integer); overload;
 procedure ImageOp_CBC(Dst, Src: TBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
   Color0, Color2: Integer);
@@ -115 +117 @@
 
   // template positions in Templates.png
-  xLogo = 1;
-  yLogo = 1;
-  wLogo = 122;
-  hLogo = 23; // logo
-  xBBook = 1;
-  yBBook = 74;
-  wBBook = 143;
-  hBBook = 73; // big book
-  xSBook = 72;
-  ySBook = 37;
-  wSBook = 72;
-  hSBook = 36; // small book
   xNation = 1;
   yNation = 25;
@@ -177 +167 @@
   Ornament: TGraphicSetItem;
   Logo: TGraphicSetItem;
+  BigBook: TGraphicSetItem;
+  SmallBook: TGraphicSetItem;
+  MenuLogo: TGraphicSetItem;
   ClickFrameColor: Integer;
   MainTextureAge: Integer;
@@ -734 +727 @@
   Src.EndUpdate;
   dst.EndUpdate;
+end;
+
+procedure ImageOp_BCC(Dst, Src: TBitmap; DstPos: TPoint; SrcRect: TRect;
+  Color1, Color2: Integer);
+begin
+  ImageOp_BCC(Dst, Src, DstPos.X, DstPos.Y, SrcRect.Left, SrcRect.Top,
+    SrcRect.Width, SrcRect.Height, Color1, Color2);
 end;
 
@@ -1498 +1498 @@
   // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
   LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, wLogo, hLogo, ca, x, y);
-  ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, 1, 1, wLogo, hLogo,
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, ca, x, y);
+  ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), Logo.BoundsRect,
     clLight, clShade);
-  BitBltCanvas(ca, x, y, wLogo, hLogo, LogoBuffer.Canvas, 0, 0);
+  BitBltCanvas(ca, x, y, Logo.Width, Logo.Height, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -1682 +1682 @@
   LoadFonts;
   Templates := LoadGraphicSet2('Templates.png');
+  Logo := Templates.GetItem('Logo');
+  BigBook := Templates.GetItem('BigBook');
+  SmallBook := Templates.GetItem('SmallBook');
+  MenuLogo := Templates.GetItem('MenuLogo');
   LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
   LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');
@@ -1698 +1702 @@
   ResolutionChanged := False;
   {$ENDIF}
-
-  LogoBuffer := TBitmap.Create;
-  LogoBuffer.PixelFormat := pf24bit;
-  LogoBuffer.SetSize(wBBook, hBBook);
 
   for Section := Low(TFontType) to High(TFontType) do
@@ -1728 +1728 @@
 
   LoadAssets;
+
+  LogoBuffer := TBitmap.Create;
+  LogoBuffer.PixelFormat := pf24bit;
+  LogoBuffer.SetSize(BigBook.Width, BigBook.Height);
 end;