Changeset 349 for branches/highdpi/Packages/CevoComponents/ScreenTools.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/Packages/CevoComponents/ScreenTools.pas (modified) (33 diffs)

branches/highdpi/Packages/CevoComponents/ScreenTools.pas

@@ -8 +8 @@
   {$ENDIF}
   StringTables, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Math,
-  Forms, Menus, GraphType;
+  Forms, Menus, GraphType, fgl, UGraphicSet, LazFileUtils;
 
 type
@@ -25 +25 @@
   TLoadGraphicFileOptions = set of TLoadGraphicFileOption;
 
+  TFontType = (ftNormal, ftSmall, ftTiny, ftCaption, ftButton);
 
 {$IFDEF WINDOWS}
@@ -38 +39 @@
 function HexStringToColor(S: string): integer;
 function LoadGraphicFile(Bmp: TDpiBitmap; FileName: string; Options: TLoadGraphicFileOptions = []): boolean;
-function LoadGraphicSet(const Name: string): integer;
-procedure Dump(dst: TDpiBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
-procedure Sprite(Canvas: TDpiCanvas; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
+function LoadGraphicSet(const Name: string): TGraphicSet;
+function LoadGraphicSet2(const Name: string): TGraphicSet;
+procedure Dump(dst: TDpiBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure BitmapReplaceColor(Dst: TDpiBitmap; X, Y, Width, Height: Integer; OldColor, NewColor: TColor);
+procedure Sprite(Canvas: TDpiCanvas; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
   overload;
-procedure Sprite(dst: TDpiBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure Sprite(dst: TDpiBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
   overload;
 procedure MakeBlue(Dst: TDpiBitmap; X, Y, Width, Height: Integer);
 procedure MakeRed(Dst: TDpiBitmap; X, Y, Width, Height: Integer);
 procedure ImageOp_B(dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height: Integer);
-procedure ImageOp_BCC(dst, Src: TDpiBitmap;
-  xDst, yDst, xSrc, ySrc, Width, Height, Color1, Color2: Integer);
+procedure ImageOp_BCC(Dst, Src: TDpiBitmap;
+  xDst, yDst, xSrc, ySrc, Width, Height, Color1, Color2: Integer); overload;
+procedure ImageOp_BCC(Dst, Src: TDpiBitmap;
+  DstPos: TPoint; SrcRect: TRect; Color1, Color2: Integer); overload;
 procedure ImageOp_CBC(Dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
   Color0, Color2: Integer);
@@ -88 +93 @@
 procedure VLightGradient(ca: TDpiCanvas; x, y, Height, Color: integer);
 procedure VDarkGradient(ca: TDpiCanvas; x, y, Height, Kind: integer);
+procedure UnderlinedTitleValue(Canvas: TDpiCanvas; Title, Value: string; X, Y, Width: Integer);
 procedure NumberBar(dst: TDpiBitmap; x, y: integer; Cap: string; val: integer;
   const T: TTexture);
@@ -97 +103 @@
   Kind, x, y, size, pos, Growth, max: integer; IndicateComplete: boolean;
   const T: TTexture);
-procedure PaintLogo(ca: TDpiCanvas; x, y, clLight, clShade: integer);
+procedure PaintLogo(Canvas: TDpiCanvas; X, Y, LightColor, ShadeColor: integer);
 function SetMainTextureByAge(Age: integer): boolean;
 procedure LoadPhrases;
 procedure Texturize(Dest, Texture: TDpiBitmap; TransparentColor: Cardinal);
 procedure DarkenImage(Bitmap: TDpiBitmap; Change: Integer);
+procedure UnshareBitmap(Bitmap: TDpiBitmap);
 
 const
-  nGrExtmax = 64;
+  TransparentColor1 = $FF00FF;
+  TransparentColor2 = $7F007F;
+
   wMainTexture = 640;
   hMainTexture = 480;
 
-  // template positions in Template.bmp
-  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
+  // template positions in Templates.png
   xNation = 1;
   yNation = 25;
@@ -133 +130 @@
 
   EmptySpaceColor = $101010;
-
-  // template positions in System2.bmp
-  xOrna = 156;
-  yOrna = 1;
-  wOrna = 27;
-  hOrna = 26; // ornament
 
   // color matrix
@@ -167 +158 @@
   cliWater = 4;
 
-type
-  TGrExtDescr = record { don't use dynamic strings here! }
-    Name: string[31];
-    Data: TDpiBitmap;
-    Mask: TDpiBitmap;
-    pixUsed: array [Byte] of Byte;
-  end;
-
-  TGrExtDescrSize = record { for size calculation only - must be the same as
-      TGrExtDescr, but without pixUsed }
-    Name: string[31];
-    Data: TDpiBitmap;
-    Mask: TDpiBitmap;
-  end;
-
-  TFontType = (ftNormal, ftSmall, ftTiny, ftCaption, ftButton);
-
 var
   Phrases: TStringTable;
   Phrases2: TStringTable;
-  nGrExt: Integer;
-  GrExt: array [0 .. nGrExtmax - 1] of ^TGrExtDescr;
-  HGrSystem: Integer;
-  HGrSystem2: Integer;
+  GrExt: TGraphicSets;
+  HGrSystem: TGraphicSet;
+  HGrSystem2: TGraphicSet;
   ClickFrameColor: Integer;
   MainTextureAge: Integer;
   MainTexture: TTexture;
-  Templates: TDpiBitmap;
+  Templates: TGraphicSet;
   Colors: TDpiBitmap;
   Paper: TDpiBitmap;
@@ -203 +176 @@
   InitOrnamentDone: Boolean;
   Phrases2FallenBackToEnglish: Boolean;
+
+  // Graphic set items
+  CityMark1: TGraphicSetItem;
+  CityMark2: TGraphicSetItem;
+  Ornament: TGraphicSetItem;
+  Logo: TGraphicSetItem;
+  BigBook: TGraphicSetItem;
+  SmallBook: TGraphicSetItem;
+  MenuLogo: TGraphicSetItem;
+  LinkArrows: TGraphicSetItem;
+  ScienceNationDot: TGraphicSetItem;
+  ResearchIcon: TGraphicSetItem;
+  ChangeIcon: TGraphicSetItem;
+  TreasuryIcon: TGraphicSetItem;
+  StarshipDeparted: TGraphicSetItem;
+  WeightOn: TGraphicSetItem;
+  WeightOff: TGraphicSetItem;
 
   UniFont: array [TFontType] of TDpiFont;
@@ -489 +479 @@
 end;
 
-function LoadGraphicSet(const Name: string): Integer;
-var
-  I, x, y, xmax, OriginalColor: Integer;
+function LoadGraphicSet(const Name: string): TGraphicSet;
+var
+  x: Integer;
+  y: Integer;
+  OriginalColor: Integer;
   FileName: string;
-  Source: TDpiBitmap;
-  DataPixel, MaskPixel: TPixelPointer;
-begin
-  I := 0;
-  while (I < nGrExt) and (GrExt[i].Name <> Name) do
-    Inc(I);
-  Result := I;
-  if I = nGrExt then begin
-    Source := TDpiBitmap.Create;
-    Source.PixelFormat := pf24bit;
+  DataPixel: TPixelPointer;
+  MaskPixel: TPixelPointer;
+begin
+  Result := GrExt.SearchByName(Name);
+  if not Assigned(Result) then begin
+    Result := GrExt.AddNew(Name);
     FileName := GetGraphicsDir + DirectorySeparator + Name;
-    if not LoadGraphicFile(Source, FileName) then begin
-      Result := -1;
+    // Do not apply gamma during file load as it would affect also transparency colors
+    if not LoadGraphicFile(Result.Data, FileName, [gfNoGamma]) then begin
+      Result := nil;
       Exit;
     end;
 
-    GetMem(GrExt[nGrExt], SizeOf(TGrExtDescrSize) + Source.Height div 49 * 10);
-    GrExt[nGrExt].Name := Name;
-
-    xmax := Source.Width - 1; // allows 4-byte access even for last pixel
-    // Why there was that limit?
-    //if xmax > 970 then
-    //  xmax := 970;
-
-    GrExt[nGrExt].Data := Source;
-    GrExt[nGrExt].Data.PixelFormat := pf24bit;
-    GrExt[nGrExt].Mask := TDpiBitmap.Create;
-    GrExt[nGrExt].Mask.PixelFormat := pf24bit;
-    GrExt[nGrExt].Mask.SetSize(Source.Width, Source.Height);
-
-    GrExt[nGrExt].Data.BeginUpdate;
-    GrExt[nGrExt].Mask.BeginUpdate;
-    DataPixel := PixelPointer(GrExt[nGrExt].Data);
-    MaskPixel := PixelPointer(GrExt[nGrExt].Mask);
-    for y := 0 to ScaleToNative(Source.Height) - 1 do begin
-      for x := 0 to ScaleToNative(xmax) - 1 do begin
+    FileName := ExtractFileNameWithoutExt(FileName) + GraphicSetFileExt;
+    if FileExists(FileName) then
+      Result.LoadFromFile(FileName);
+
+    Result.ResetPixUsed;
+
+    Result.Mask.SetSize(Result.Data.Width, Result.Data.Height);
+
+    Result.Data.BeginUpdate;
+    Result.Mask.BeginUpdate;
+    DataPixel := PixelPointer(Result.Data);
+    MaskPixel := PixelPointer(Result.Mask);
+    for y := 0 to ScaleToNative(Result.Data.Height) - 1 do begin
+      for x := 0 to ScaleToNative(Result.Data.Width) - 1 do begin
         OriginalColor := DataPixel.Pixel^.ARGB and $FFFFFF;
-        if (OriginalColor = $FF00FF) or (OriginalColor = $7F007F) then
-        begin // transparent
-          MaskPixel.Pixel^.ARGB := $FFFFFF;
-          DataPixel.Pixel^.ARGB := DataPixel.Pixel^.ARGB and $FF000000;
-        end
-        else begin
-          MaskPixel.Pixel^.ARGB := $000000; // non-transparent
-          if Gamma <> 100 then
-            DataPixel.Pixel^ := ApplyGammaToPixel(DataPixel.Pixel^);
+        if (OriginalColor = TransparentColor1) or (OriginalColor = TransparentColor2) then begin
+          MaskPixel.Pixel^.R := $FF;
+          MaskPixel.Pixel^.G := $FF;
+          MaskPixel.Pixel^.B := $FF;
+          DataPixel.Pixel^.R := 0;
+          DataPixel.Pixel^.G := 0;
+          DataPixel.Pixel^.B := 0;
+        end else begin
+          MaskPixel.Pixel^.R := $00;
+          MaskPixel.Pixel^.G := $00;
+          MaskPixel.Pixel^.B := $00;
         end;
         DataPixel.NextPixel;
@@ -546 +531 @@
       MaskPixel.NextLine;
     end;
-    GrExt[nGrExt].Data.EndUpdate;
-    GrExt[nGrExt].Mask.EndUpdate;
-
-    FillChar(GrExt[nGrExt].pixUsed, GrExt[nGrExt].Data.Height div 49 * 10, 0);
-    Inc(nGrExt);
-  end;
-end;
-
-procedure Dump(dst: TDpiBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
+    Result.Data.EndUpdate;
+    Result.Mask.EndUpdate;
+
+    if Gamma <> 100 then
+      ApplyGammaToBitmap(Result.Data);
+  end;
+end;
+
+function LoadGraphicSet2(const Name: string): TGraphicSet;
+var
+  FileName: string;
+begin
+  Result := GrExt.SearchByName(Name);
+  if not Assigned(Result) then begin
+    Result := GrExt.AddNew(Name);
+    FileName := GetGraphicsDir + DirectorySeparator + Name;
+    if not LoadGraphicFile(Result.Data, FileName, [gfNoGamma]) then begin
+      Result := nil;
+      Exit;
+    end;
+
+    FileName := ExtractFileNameWithoutExt(FileName) + GraphicSetFileExt;
+    if FileExists(FileName) then
+      Result.LoadFromFile(FileName);
+
+    Result.ResetPixUsed;
+  end;
+end;
+
+procedure Dump(dst: TDpiBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
 begin
   DpiBitCanvas(dst.Canvas, xDst, yDst, Width, Height,
-    GrExt[HGr].Data.Canvas, xGr, yGr);
+    HGr.Data.Canvas, xGr, yGr);
+end;
+
+procedure BitmapReplaceColor(Dst: TDpiBitmap; X, Y, Width, Height: Integer; OldColor, NewColor: TColor);
+var
+  XX, YY: Integer;
+  PixelPtr: TPixelPointer;
+begin
+  Dst.BeginUpdate;
+  PixelPtr := PixelPointer(Dst, ScaleToNative(X), ScaleToNative(Y));
+  for YY := 0 to ScaleToNative(Height) - 1 do begin
+    for XX := 0 to ScaleToNative(Width) - 1 do begin
+      if PixelPtr.Pixel^.RGB = SwapRedBlue(OldColor) then begin
+        PixelPtr.Pixel^.RGB := SwapRedBlue(NewColor);
+      end;
+      PixelPtr.NextPixel;
+    end;
+    PixelPtr.NextLine;
+  end;
+  Dst.EndUpdate;
 end;
 
@@ -734 +759 @@
 end;
 
+procedure ImageOp_BCC(Dst, Src: TDpiBitmap; 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;
+
 procedure ImageOp_CBC(Dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
   Color0, Color2: Integer);
@@ -820 +852 @@
 end;
 
-procedure Sprite(Canvas: TDpiCanvas; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure Sprite(Canvas: TDpiCanvas; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
 begin
   DpiBitCanvas(Canvas, xDst, yDst, Width, Height,
-    GrExt[HGr].Mask.Canvas, xGr, yGr, SRCAND);
+    HGr.Mask.Canvas, xGr, yGr, SRCAND);
   DpiBitCanvas(Canvas, xDst, yDst, Width, Height,
-    GrExt[HGr].Data.Canvas, xGr, yGr, SRCPAINT);
-end;
-
-procedure Sprite(dst: TDpiBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
+    HGr.Data.Canvas, xGr, yGr, SRCPAINT);
+end;
+
+procedure Sprite(dst: TDpiBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
 begin
   DpiBitCanvas(dst.Canvas, xDst, yDst, Width, Height,
-    GrExt[HGr].Mask.Canvas, xGr, yGr, SRCAND);
+    HGr.Mask.Canvas, xGr, yGr, SRCAND);
   DpiBitCanvas(dst.Canvas, xDst, yDst, Width, Height,
-    GrExt[HGr].Data.Canvas, xGr, yGr, SRCPAINT);
+    HGr.Data.Canvas, xGr, yGr, SRCPAINT);
 end;
 
@@ -1011 +1043 @@
   Shade := ColorToColor32(MainTexture.clBevelShade and $FCFCFC shr 2 * 3 +
     MainTexture.clBevelLight and $FCFCFC shr 2);
-  GrExt[HGrSystem2].Data.BeginUpdate;
-  PixelPtr := PixelPointer(GrExt[HGrSystem2].Data, ScaleToNative(xOrna), ScaleToNative(yOrna));
+  HGrSystem2.Data.BeginUpdate;
+  PixelPtr := PixelPointer(HGrSystem2.Data, ScaleToNative(Ornament.Left), ScaleToNative(Ornament.Top));
   if PixelPtr.BytesPerPixel = 3 then begin
-    for Y := 0 to ScaleToNative(hOrna) - 1 do begin
-      for X := 0 to ScaleToNative(wOrna) - 1 do begin
-        P := Color32ToColor(PixelPtr.Pixel^.GetRGB);
-        if P = $0000FF then PixelPtr.Pixel^.SetRGB(Light)
-        else if P = $FF0000 then PixelPtr.Pixel^.SetRGB(Shade);
+    for Y := 0 to ScaleToNative(Ornament.Height) - 1 do begin
+      for X := 0 to ScaleToNative(Ornament.Width) - 1 do begin
+        P := Color32ToColor(PixelPtr.Pixel^.RGB);
+        if P = $0000FF then PixelPtr.Pixel^.RGB := Light
+        else if P = $FF0000 then PixelPtr.Pixel^.RGB := Shade;
         PixelPtr.NextPixel;
       end;
@@ -1024 +1056 @@
     end;
   end else begin
-    for Y := 0 to ScaleToNative(hOrna) - 1 do begin
-      for X := 0 to ScaleToNative(wOrna) - 1 do begin
+    for Y := 0 to ScaleToNative(Ornament.Height) - 1 do begin
+      for X := 0 to ScaleToNative(Ornament.Width) - 1 do begin
         P := Color32ToColor(PixelPtr.Pixel^.ARGB);
         if P = $0000FF then PixelPtr.Pixel^.ARGB := Light
@@ -1035 +1067 @@
   end;
   InitOrnamentDone := True;
-  GrExt[HGrSystem2].Data.EndUpdate;
+  HGrSystem2.Data.EndUpdate;
 end;
 
 procedure InitCityMark(const T: TTexture);
 var
-  x, y, intensity: Integer;
-begin
-  for x := 0 to 9 do
-    for y := 0 to 9 do
-      if GrExt[HGrSystem].Mask.Canvas.Pixels[66 + x, 47 + y] = 0 then
+  x: Integer;
+  y: Integer;
+  Intensity: Integer;
+begin
+  for x := 0 to CityMark1.Width - 1 do begin
+    for y := 0 to CityMark1.Height - 1 do begin
+      if HGrSystem.Mask.Canvas.Pixels[CityMark1.Left + x, CityMark1.Top + y] = 0 then
       begin
-        intensity := GrExt[HGrSystem].Data.Canvas.Pixels[66 +
-          x, 47 + y] and $FF;
-        GrExt[HGrSystem].Data.Canvas.Pixels[77 + x, 47 + y] :=
-          T.clMark and $FF * intensity div $FF + T.clMark shr 8 and
-          $FF * intensity div $FF shl 8 + T.clMark shr 16 and
-          $FF * intensity div $FF shl 16;
+        Intensity := HGrSystem.Data.Canvas.Pixels[CityMark1.Left +
+          x, CityMark1.Top + y] and $FF;
+        HGrSystem.Data.Canvas.Pixels[CityMark2.Left + x, CityMark2.Top + y] :=
+          T.clMark and $FF * Intensity div $FF + T.clMark shr 8 and
+          $FF * Intensity div $FF shl 8 + T.clMark shr 16 and
+          $FF * Intensity div $FF shl 16;
       end;
-  DpiBitCanvas(GrExt[HGrSystem].Mask.Canvas, 77, 47, 10, 10,
-    GrExt[HGrSystem].Mask.Canvas, 66, 47);
+    end;
+  end;
+  DpiBitCanvas(HGrSystem.Mask.Canvas, CityMark2.Left, CityMark2.Top, CityMark1.Width, CityMark1.Width,
+    HGrSystem.Mask.Canvas, CityMark1.Left, CityMark1.Top);
 end;
 
@@ -1153 +1189 @@
 procedure Corner(ca: TDpiCanvas; x, y, Kind: Integer; const T: TTexture);
 begin
-  { DpiBitCanvas(ca,x,y,8,8,GrExt[T.HGr].Mask.Canvas,
+  { DpiBitCanvas(ca,x,y,8,8,T.HGr.Mask.Canvas,
     T.xGr+29+Kind*9,T.yGr+89,SRCAND);
-    DpiBitCanvas(ca,x,y,8,8,GrExt[T.HGr].Data.Canvas,
+    DpiBitCanvas(ca,x,y,8,8,T.HGr.Data.Canvas,
     T.xGr+29+Kind*9,T.yGr+89,SRCPAINT); }
 end;
@@ -1163 +1199 @@
   procedure PaintIcon(x, y, Kind: Integer);
   begin
-    DpiBitCanvas(ca, x, y + 6, 10, 10, GrExt[HGrSystem].Mask.Canvas,
+    DpiBitCanvas(ca, x, y + 6, 10, 10, HGrSystem.Mask.Canvas,
       66 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCAND);
-    DpiBitCanvas(ca, x, y + 6, 10, 10, GrExt[HGrSystem].Data.Canvas,
+    DpiBitCanvas(ca, x, y + 6, 10, 10, HGrSystem.Data.Canvas,
       66 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCPAINT);
   end;
@@ -1173 +1209 @@
   sp: string;
   shadow: Boolean;
+  Text: string;
 begin
   Inc(x);
@@ -1196 +1233 @@
           else
           begin
-            Textout(xp, y, copy(sp, 1, p - 1));
-            Inc(xp, ca.TextWidth(copy(sp, 1, p - 1)));
+            Text := Copy(sp, 1, p - 1);
+            Textout(xp, y, Text);
+            Inc(xp, ca.TextWidth(Text));
             if not shadow then
               case sp[p + 1] of
@@ -1305 +1343 @@
     (16, 12, 8, 4, 0, -4, -8, -12 - 24, -16 + 16, -20, -24, -28, -32, -36, -40, -44);
 begin
-  Gradient(ca, x, y, 0, 1, Width, 0, GrExt[HGrSystem].Data.Canvas.Pixels
+  Gradient(ca, x, y, 0, 1, Width, 0, HGrSystem.Data.Canvas.Pixels
     [187, 137 + Kind], Brightness);
 end;
@@ -1323 +1361 @@
 begin
   Gradient(ca, x, y, 1, 0, 0, Height,
-    GrExt[HGrSystem].Data.Canvas.Pixels[187, 137 + Kind], Brightness);
+    HGrSystem.Data.Canvas.Pixels[187, 137 + Kind], Brightness);
+end;
+
+procedure UnderlinedTitleValue(Canvas: TDpiCanvas; Title, Value: string; X, Y, Width: Integer);
+begin
+  DLine(Canvas, X, X + Width, Y + 19, MainTexture.clBevelLight, MainTexture.clBevelShade);
+  RisedTextOut(Canvas, X, Y, Title);
+  RisedTextOut(Canvas, X + Width - BiColorTextWidth(Canvas, Value), Y, Value);
 end;
 
@@ -1385 +1430 @@
       begin
         DpiBitCanvas(dst.Canvas, xIcon + 4 + i * (14 * ld div sd), yIcon + 2 + 1, 14,
-          14, GrExt[HGrSystem].Mask.Canvas, 67 + Kind mod 8 * 15,
+          14, HGrSystem.Mask.Canvas, 67 + Kind mod 8 * 15,
           70 + Kind div 8 * 15, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + i * (14 * ld div sd), yIcon + 2,
@@ -1394 +1439 @@
         DpiBitCanvas(dst.Canvas, xIcon + 4 + (val mod 10) *
           (14 * ld div sd) + i * (14 * ld div sd), yIcon + 3, 14, 14,
-          GrExt[HGrSystem].Mask.Canvas, 67 + 7 mod 8 * 15,
+          HGrSystem.Mask.Canvas, 67 + 7 mod 8 * 15,
           70 + 7 div 8 * 15, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + (val mod 10) *
@@ -1418 +1463 @@
       begin
         DpiBitCanvas(dst.Canvas, xIcon + 4 + i * (14 * ld div sd), yIcon + 3, 14, 14,
-          GrExt[HGrSystem].Mask.Canvas, 67 + Kind mod 8 * 15,
+          HGrSystem.Mask.Canvas, 67 + Kind mod 8 * 15,
           70 + Kind div 8 * 15, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + i * (14 * ld div sd), yIcon + 2,
@@ -1427 +1472 @@
         DpiBitCanvas(dst.Canvas, xIcon + 4 + (val div 10) *
           (14 * ld div sd) + i * (10 * ld div sd), yIcon + 7, 10, 10,
-          GrExt[HGrSystem].Mask.Canvas, 66 + Kind mod 11 * 11,
+          HGrSystem.Mask.Canvas, 66 + Kind mod 11 * 11,
           115 + Kind div 11 * 11, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + (val div 10) *
@@ -1463 +1508 @@
     for i := 0 to pos div 8 - 1 do
       DpiBitCanvas(ca, x + i * 8, y, 8, 7,
-        GrExt[HGrSystem].Data.Canvas, 104, 9 + 8 * Kind);
+        HGrSystem.Data.Canvas, 104, 9 + 8 * Kind);
     DpiBitCanvas(ca, x + 8 * (pos div 8), y, pos - 8 * (pos div 8), 7,
-      GrExt[HGrSystem].Data.Canvas, 104, 9 + 8 * Kind);
+      HGrSystem.Data.Canvas, 104, 9 + 8 * Kind);
     if Growth > 0 then
     begin
       for i := 0 to Growth div 8 - 1 do
         DpiBitCanvas(ca, x + pos + i * 8, y, 8, 7,
-          GrExt[HGrSystem].Data.Canvas, 112, 9 + 8 * Kind);
+          HGrSystem.Data.Canvas, 112, 9 + 8 * Kind);
       DpiBitCanvas(ca, x + pos + 8 * (Growth div 8), y,
-        Growth - 8 * (Growth div 8), 7, GrExt[HGrSystem].Data.Canvas,
+        Growth - 8 * (Growth div 8), 7, HGrSystem.Data.Canvas,
         112, 9 + 8 * Kind);
     end
@@ -1479 +1524 @@
       for i := 0 to -Growth div 8 - 1 do
         DpiBitCanvas(ca, x + pos + i * 8, y, 8, 7,
-          GrExt[HGrSystem].Data.Canvas, 104, 1);
+          HGrSystem.Data.Canvas, 104, 1);
       DpiBitCanvas(ca, x + pos + 8 * (-Growth div 8), y, -Growth -
         8 * (-Growth div 8), 7,
-        GrExt[HGrSystem].Data.Canvas, 104, 1);
+        HGrSystem.Data.Canvas, 104, 1);
     end;
     Brush.Color := $000000;
@@ -1505 +1550 @@
 end;
 
-procedure PaintLogo(ca: TDpiCanvas; x, y, clLight, clShade: Integer);
-begin
-  // 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, wLogo, hLogo, ca, x, y);
-  ImageOp_BCC(LogoBuffer, Templates, 0, 0, 1, 1, wLogo, hLogo,
-    clLight, clShade);
-  DpiBitCanvas(ca, x, y, wLogo, hLogo, LogoBuffer.Canvas, 0, 0);
+procedure PaintLogo(Canvas: TDpiCanvas; X, Y, LightColor, ShadeColor: Integer);
+begin
+  UnshareBitmap(LogoBuffer);
+  DpiBitCanvas(LogoBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, Canvas, X, Y);
+  ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), Logo.BoundsRect,
+    LightColor, ShadeColor);
+  DpiBitCanvas(Canvas, X, Y, Logo.Width, Logo.Height, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -1611 +1655 @@
 end;
 
-function ScaleToNative(Value: Integer): Integer;
-begin
-  Result := Value;
-end;
-
-function ScaleFromNative(Value: Integer): Integer;
-begin
-  Result := Value;
+procedure UnshareBitmap(Bitmap: TDpiBitmap);
+begin
+  // FillRect cause image data to be freed so subsequent BitBlt can access valid image data
+  Bitmap.Canvas.FillRect(0, 0, 0, 0);
 end;
 
@@ -1695 +1735 @@
   LoadPhrases;
   LoadFonts;
-  LoadGraphicFile(Templates, GetGraphicsDir + DirectorySeparator +
-    'Templates.png', [gfNoGamma]);
+  Templates := LoadGraphicSet2('Templates.png');
+  with Templates do begin
+    Logo := GetItem('Logo');
+    BigBook := GetItem('BigBook');
+    SmallBook := GetItem('SmallBook');
+    MenuLogo := GetItem('MenuLogo');
+    LinkArrows := GetItem('LinkArrows');
+    ScienceNationDot := GetItem('ScienceNationDot');
+    ResearchIcon := GetItem('Research');
+    ChangeIcon := GetItem('Change');
+    TreasuryIcon := GetItem('Treasury');
+    StarshipDeparted := GetItem('StarshipDeparted');
+    WeightOn := GetItem('WeightOn');
+    WeightOff := GetItem('WeightOff');
+  end;
+
   LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
   LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');
@@ -1714 +1768 @@
   {$ENDIF}
 
-  LogoBuffer := TDpiBitmap.Create;
-  LogoBuffer.PixelFormat := pf24bit;
-  LogoBuffer.SetSize(wBBook, hBBook);
-
   for Section := Low(TFontType) to High(TFontType) do
     UniFont[Section] := TDpiFont.Create;
 
-  nGrExt := 0;
+  GrExt := TGraphicSets.Create;
+
   HGrSystem := LoadGraphicSet('System.png');
+  CityMark1 := HGrSystem.GetItem('CityMark1');
+  CityMark2 := HGrSystem.GetItem('CityMark2');
+
   HGrSystem2 := LoadGraphicSet('System2.png');
-  Templates := TDpiBitmap.Create;
-  Templates.PixelFormat := pf24bit;
+  Ornament := HGrSystem2.GetItem('Ornament');
+
   Colors := TDpiBitmap.Create;
   Colors.PixelFormat := pf24bit;
@@ -1734 +1788 @@
   MainTexture.Image := TDpiBitmap.Create;
   MainTextureAge := -2;
-  ClickFrameColor := GrExt[HGrSystem].Data.Canvas.Pixels[187, 175];
+  ClickFrameColor := HGrSystem.Data.Canvas.Pixels[187, 175];
   InitOrnamentDone := False;
   GenerateNames := True;
 
   LoadAssets;
+
+  LogoBuffer := TDpiBitmap.Create;
+  LogoBuffer.PixelFormat := pf24bit;
+  LogoBuffer.SetSize(BigBook.Width, BigBook.Height);
 end;
 
 procedure UnitDone;
-var
-  I: integer;
 begin
   RestoreResolution;
-  for I := 0 to nGrExt - 1 do begin
-    FreeAndNil(GrExt[I].Data);
-    FreeAndNil(GrExt[I].Mask);
-    FreeMem(GrExt[I]);
-  end;
-
+  FreeAndNil(GrExt);
   ReleaseFonts;
-
   FreeAndNil(Phrases);
   FreeAndNil(Phrases2);
@@ -1759 +1809 @@
   FreeAndNil(BigImp);
   FreeAndNil(Paper);
-  FreeAndNil(Templates);
   FreeAndNil(Colors);
   FreeAndNil(MainTexture.Image);