Changeset 352 for trunk/Packages/CevoComponents

Timestamp:

Apr 6, 2021, 10:16:55 PM (4 years ago)

Author:

chronos

Message:

• Modified: TTexture changed from record to class.
• Modified: Code cleanup.

Location:

trunk/Packages/CevoComponents

Files:

• BaseWin.pas (modified) (10 diffs)
• DrawDlg.pas (modified) (1 diff)
• ScreenTools.pas (modified) (27 diffs)

trunk/Packages/CevoComponents/BaseWin.pas

@@ -292 +292 @@
   procedure CornerFrame(x0, y0, x1, y1: integer);
   begin
-    Frame(Canvas, x0 + 1, y0 + 1, x1 - 2, y1 - 2, MainTexture.clBevelLight,
-      MainTexture.clBevelShade);
-    Frame(Canvas, x0 + 2, y0 + 2, x1 - 3, y1 - 3, MainTexture.clBevelLight,
-      MainTexture.clBevelShade);
+    Frame(Canvas, x0 + 1, y0 + 1, x1 - 2, y1 - 2, MainTexture.ColorBevelLight,
+      MainTexture.ColorBevelShade);
+    Frame(Canvas, x0 + 2, y0 + 2, x1 - 3, y1 - 3, MainTexture.ColorBevelLight,
+      MainTexture.ColorBevelShade);
     Corner(Canvas, x0 + 1, y0 + 1, 0, MainTexture);
     Corner(Canvas, x1 - 9, y0 + 1, 1, MainTexture);
@@ -318 +318 @@
   l := BiColorTextWidth(Canvas, Caption);
   Cut := (ClientWidth - l) div 2;
-  xTexOffset := (wMaintexture - ClientWidth) div 2;
-  yTexOffset := (hMaintexture - ClientHeight) div 2;
+  xTexOffset := (Maintexture.Width - ClientWidth) div 2;
+  yTexOffset := (Maintexture.Height - ClientHeight) div 2;
   if WideBottom then
     InnerBottom := ClientHeight - WideFrame
@@ -345 +345 @@
   Frame(Canvas, 0, FrameTop, ClientWidth - 1, FrameBottom - 1, 0, 0);
   Frame(Canvas, SideFrame - 1, TitleHeight - 1, ClientWidth - SideFrame,
-    InnerBottom, MainTexture.clBevelShade, MainTexture.clBevelLight);
+    InnerBottom, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
   // RFrame(Canvas,SideFrame-2,TitleHeight-2,ClientWidth-SideFrame+1,
-  // InnerBottom+1,MainTexture.clBevelShade,MainTexture.clBevelLight);
+  // InnerBottom+1,MainTexture.ColorBevelShade,MainTexture.ColorBevelLight);
   if FullCaption then
   begin
@@ -367 +367 @@
           4, xTexOffset, yTexOffset);
         CornerFrame(0, FrameTop, ClientWidth, FrameBottom);
-        Pen.Color := MainTexture.clBevelShade;
+        Pen.Color := MainTexture.ColorBevelShade;
         MoveTo(3 + ModalFrameIndent, 2);
         LineTo(3 + ModalFrameIndent, TitleHeight);
-        Pen.Color := MainTexture.clBevelShade;
+        Pen.Color := MainTexture.ColorBevelShade;
         MoveTo(4 + ModalFrameIndent, TitleHeight - 1);
         LineTo(ClientWidth - 4 - ModalFrameIndent, TitleHeight - 1);
         LineTo(ClientWidth - 4 - ModalFrameIndent, 1);
-        Pen.Color := MainTexture.clBevelLight;
+        Pen.Color := MainTexture.ColorBevelLight;
         MoveTo(ClientWidth - 5 - ModalFrameIndent, 2);
         LineTo(4 + ModalFrameIndent, 2);
@@ -380 +380 @@
         MoveTo(ClientWidth - 4 - ModalFrameIndent, 1);
         LineTo(3 + ModalFrameIndent, 1);
-        Pen.Color := MainTexture.clBevelLight;
+        Pen.Color := MainTexture.ColorBevelLight;
         MoveTo(ClientWidth - 3 - ModalFrameIndent, 3);
         LineTo(ClientWidth - 3 - ModalFrameIndent, TitleHeight);
@@ -397 +397 @@
 
     Frame(Canvas, CaptionLeft + 1, 0 + 1, ClientWidth - CaptionLeft - 2,
-      TitleHeight - 1, MainTexture.clBevelLight, MainTexture.clBevelShade);
+      TitleHeight - 1, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
     Frame(Canvas, CaptionLeft + 2, 0 + 2, ClientWidth - CaptionLeft - 3,
-      TitleHeight - 1, MainTexture.clBevelLight, MainTexture.clBevelShade);
+      TitleHeight - 1, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
     Corner(Canvas, CaptionLeft + 1, 0 + 1, 0, MainTexture);
     Corner(Canvas, ClientWidth - CaptionLeft - 9, 0 + 1, 1, MainTexture);
@@ -405 +405 @@
     with Canvas do
     begin
-      Pen.Color := MainTexture.clBevelShade;
+      Pen.Color := MainTexture.ColorBevelShade;
       MoveTo(CaptionLeft + 1, FrameTop + 2);
       LineTo(CaptionLeft + 1, TitleHeight);
-      Pen.Color := MainTexture.clBevelLight;
+      Pen.Color := MainTexture.ColorBevelLight;
       MoveTo(ClientWidth - CaptionLeft - 2, FrameTop + 2);
       LineTo(ClientWidth - CaptionLeft - 2, TitleHeight);
@@ -421 +421 @@
       Frame(Canvas, CaptionLeft + 1, ClientHeight - WideFrame - 1 + 1,
         ClientWidth - CaptionLeft - 2, ClientHeight - 2,
-        MainTexture.clBevelLight, MainTexture.clBevelShade);
+        MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
       Frame(Canvas, CaptionLeft + 2, ClientHeight - WideFrame - 1 + 1,
         ClientWidth - CaptionLeft - 3, ClientHeight - 3,
-        MainTexture.clBevelLight, MainTexture.clBevelShade);
+        MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
       Corner(Canvas, CaptionLeft + 1, ClientHeight - 9, 2, MainTexture);
       Corner(Canvas, ClientWidth - CaptionLeft - 9, ClientHeight - 9, 3,
@@ -431 +431 @@
       with Canvas do
       begin
-        Pen.Color := MainTexture.clBevelShade;
+        Pen.Color := MainTexture.ColorBevelShade;
         MoveTo(CaptionLeft + 1, ClientHeight - WideFrame);
         LineTo(CaptionLeft + 1, FrameBottom - 2);
-        Pen.Color := MainTexture.clBevelLight;
+        Pen.Color := MainTexture.ColorBevelLight;
         MoveTo(ClientWidth - CaptionLeft - 2, ClientHeight - WideFrame);
         LineTo(ClientWidth - CaptionLeft - 2, FrameBottom - 2);
@@ -486 +486 @@
 begin
   Fill(Offscreen.Canvas, Left, Top, Width, Height,
-    SideFrame + (wMaintexture - ClientWidth) div 2,
-    TitleHeight + (hMaintexture - ClientHeight) div 2);
+    SideFrame + (Maintexture.Width - ClientWidth) div 2,
+    TitleHeight + (Maintexture.Height - ClientHeight) div 2);
 end;
 

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -258 +258 @@
       $000000, $000000);
   Frame(Canvas, Border + 1, Border + 1, ClientWidth - (2 + Border),
-    ClientHeight - (2 + Border), MainTexture.clBevelLight,
-    MainTexture.clBevelShade);
+    ClientHeight - (2 + Border), MainTexture.ColorBevelLight,
+    MainTexture.ColorBevelShade);
   Frame(Canvas, 2 + Border, 2 + Border, ClientWidth - (3 + Border),
-    ClientHeight - (3 + Border), MainTexture.clBevelLight,
-    MainTexture.clBevelShade);
+    ClientHeight - (3 + Border), MainTexture.ColorBevelLight,
+    MainTexture.ColorBevelShade);
   SplitText(false);
 

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -11 +11 @@
 
 type
-  TTexture = record
+
+  { TTexture }
+
+  TTexture = class
+  private
+    FAge: Integer;
+    function GetHeight: Integer;
+    function GetWidth: Integer;
+    procedure SetAge(AValue: Integer);
+  public
     Image: TBitmap;
-    clBevelLight: TColor;
-    clBevelShade: TColor;
-    clTextLight: TColor;
-    clTextShade: TColor;
-    clLitText: TColor;
-    clMark: TColor;
-    clPage: TColor;
-    clCover: TColor;
-  end;
+    ColorBevelLight: TColor;
+    ColorBevelShade: TColor;
+    ColorTextLight: TColor;
+    ColorTextShade: TColor;
+    ColorLitText: TColor;
+    ColorMark: TColor;
+    ColorPage: TColor;
+    ColorCover: TColor;
+    constructor Create;
+    destructor Destroy; override;
+    procedure Assign(Source: TTexture);
+    property Age: Integer read FAge write SetAge;
+    property Width: Integer read GetWidth;
+    property Height: Integer read GetHeight;
+  end;
+
   TLoadGraphicFileOption = (gfNoError, gfNoGamma);
   TLoadGraphicFileOptions = set of TLoadGraphicFileOption;
@@ -35 +51 @@
 function TurnToString(Turn: integer): string;
 function MovementToString(Movement: integer): string;
-procedure BtnFrame(ca: TCanvas; p: TRect; const T: TTexture);
-procedure EditFrame(ca: TCanvas; p: TRect; const T: TTexture);
+procedure BtnFrame(ca: TCanvas; p: TRect; T: TTexture);
+procedure EditFrame(ca: TCanvas; p: TRect; T: TTexture);
 function HexStringToColor(S: string): integer;
 function LoadGraphicFile(Bmp: TBitmap; FileName: string; Options: TLoadGraphicFileOptions = []): boolean;
@@ -74 +90 @@
 procedure GlowFrame(Dst: TBitmap; x0, y0, Width, Height: integer; cl: TColor);
 procedure InitOrnament;
-procedure InitCityMark(const T: TTexture);
+procedure InitCityMark(T: TTexture);
 procedure Fill(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: integer); overload;
 procedure Fill(Canvas: TCanvas; Rect: TRect; Offset: TPoint); overload;
@@ -83 +99 @@
   const Texture: TBitmap);
 procedure PaintBackground(Form: TForm; Left, Top, Width, Height: integer);
-procedure Corner(ca: TCanvas; x, y, Kind: integer; const T: TTexture);
+procedure Corner(ca: TCanvas; x, y, Kind: integer; T: TTexture);
 procedure BiColorTextOut(ca: TCanvas; clMain, clBack: TColor; x, y: integer; s: string);
-procedure LoweredTextOut(ca: TCanvas; cl: TColor; const T: TTexture;
+procedure LoweredTextOut(ca: TCanvas; cl: TColor; T: TTexture;
   x, y: integer; s: string);
 function BiColorTextWidth(ca: TCanvas; s: string): integer;
@@ -95 +111 @@
 procedure UnderlinedTitleValue(Canvas: TCanvas; Title, Value: string; X, Y, Width: Integer);
 procedure NumberBar(dst: TBitmap; x, y: integer; Cap: string; val: integer;
-  const T: TTexture);
+  T: TTexture);
 procedure CountBar(dst: TBitmap; x, y, w: integer; Kind: integer;
-  Cap: string; val: integer; const T: TTexture);
+  Cap: string; val: integer; T: TTexture);
 procedure PaintProgressBar(ca: TCanvas; Kind, x, y, pos, Growth, max: integer;
-  const T: TTexture);
+  T: TTexture);
 procedure PaintRelativeProgressBar(ca: TCanvas;
   Kind, x, y, size, pos, Growth, max: integer; IndicateComplete: boolean;
-  const T: TTexture);
+  T: TTexture);
 procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: integer);
-function SetMainTextureByAge(Age: integer): boolean;
 procedure LoadPhrases;
 procedure Texturize(Dest, Texture: TBitmap; TransparentColor: Cardinal);
@@ -115 +130 @@
   TransparentColor1 = $FF00FF;
   TransparentColor2 = $7F007F;
-
-  wMainTexture = 640;
-  hMainTexture = 480;
 
   // template positions in Templates.png
@@ -167 +179 @@
   HGrSystem2: TGraphicSet;
   ClickFrameColor: Integer;
-  MainTextureAge: Integer;
   MainTexture: TTexture;
   Templates: TGraphicSet;
@@ -327 +338 @@
 end;
 
-procedure BtnFrame(ca: TCanvas; p: TRect; const T: TTexture);
-begin
-  RFrame(ca, p.Left - 1, p.Top - 1, p.Right, p.Bottom, T.clBevelShade,
-    T.clBevelLight);
-end;
-
-procedure EditFrame(ca: TCanvas; p: TRect; const T: TTexture);
+procedure BtnFrame(ca: TCanvas; p: TRect; T: TTexture);
+begin
+  RFrame(ca, p.Left - 1, p.Top - 1, p.Right, p.Bottom, T.ColorBevelShade,
+    T.ColorBevelLight);
+end;
+
+procedure EditFrame(ca: TCanvas; p: TRect; T: TTexture);
 begin
   Frame(ca, p.Left - 1, p.Top - 1, p.Right, p.Bottom, $000000, $000000);
   Frame(ca, p.Left - 2, p.Top - 2, p.Right + 1, p.Bottom + 1, $000000, $000000);
   Frame(ca, p.Left - 3, p.Top - 3, p.Right + 2, p.Bottom + 1, $000000, $000000);
-  RFrame(ca, p.Left - 4, p.Top - 4, p.Right + 3, p.Bottom + 2, T.clBevelShade,
-    T.clBevelLight);
+  RFrame(ca, p.Left - 4, p.Top - 4, p.Right + 3, p.Bottom + 2, T.ColorBevelShade,
+    T.ColorBevelLight);
 end;
 
@@ -1041 +1052 @@
 begin
   if InitOrnamentDone then Exit;
-  Light := ColorToColor32(MainTexture.clBevelLight);
-  // and $FCFCFC shr 2*3+MainTexture.clBevelShade and $FCFCFC shr 2;
-  Shade := ColorToColor32(MainTexture.clBevelShade and $FCFCFC shr 2 * 3 +
-    MainTexture.clBevelLight and $FCFCFC shr 2);
+  Light := ColorToColor32(MainTexture.ColorBevelLight);
+  // and $FCFCFC shr 2*3+MainTexture.ColorBevelShade and $FCFCFC shr 2;
+  Shade := ColorToColor32(MainTexture.ColorBevelShade and $FCFCFC shr 2 * 3 +
+    MainTexture.ColorBevelLight and $FCFCFC shr 2);
   HGrSystem2.Data.BeginUpdate;
   PixelPtr := PixelPointer(HGrSystem2.Data, ScaleToNative(Ornament.Left), ScaleToNative(Ornament.Top));
@@ -1072 +1083 @@
 end;
 
-procedure InitCityMark(const T: TTexture);
+procedure InitCityMark(T: TTexture);
 var
   x: Integer;
@@ -1085 +1096 @@
           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
+          T.ColorMark and $FF * Intensity div $FF + T.ColorMark shr 8 and
+          $FF * Intensity div $FF shl 8 + T.ColorMark shr 16 and
           $FF * Intensity div $FF shl 16;
       end;
@@ -1097 +1108 @@
 procedure Fill(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer);
 begin
-  Assert((Left + xOffset >= 0) and (Left + xOffset + Width <= wMainTexture) and
-    (Top + yOffset >= 0) and (Top + yOffset + Height <= hMainTexture));
+  Assert((Left + xOffset >= 0) and (Left + xOffset + Width <= MainTexture.Width) and
+    (Top + yOffset >= 0) and (Top + yOffset + Height <= MainTexture.Height));
   BitBltCanvas(ca, Left, Top, Width, Height, MainTexture.Image.Canvas,
     Left + xOffset, Top + yOffset);
@@ -1114 +1125 @@
     n: integer;
   begin
-    n := ((hMainTexture div 2) div (y1 - y0)) * 2;
-    while hMainTexture div 2 + (I + 1) * (y1 - y0) > hMainTexture do
+    n := ((MainTexture.Height div 2) div (y1 - y0)) * 2;
+    while MainTexture.Height div 2 + (I + 1) * (y1 - y0) > MainTexture.Height do
       Dec(I, n);
-    while hMainTexture div 2 + I * (y1 - y0) < 0 do
+    while MainTexture.Height div 2 + I * (y1 - y0) < 0 do
       Inc(I, n);
     Result := I;
@@ -1125 +1136 @@
   I: Integer;
 begin
-  for I := 0 to (x1 - xm) div wMainTexture - 1 do
-    BitBltCanvas(ca, xm + I * wMainTexture, y0, wMainTexture, y1 - y0,
-      MainTexture.Image.Canvas, 0, hMainTexture div 2 + Band(I) *
+  for I := 0 to (x1 - xm) div MainTexture.Width - 1 do
+    BitBltCanvas(ca, xm + I * MainTexture.Width, y0, MainTexture.Width, y1 - y0,
+      MainTexture.Image.Canvas, 0, MainTexture.Height div 2 + Band(I) *
       (y1 - y0));
-  BitBltCanvas(ca, xm + ((x1 - xm) div wMainTexture) * wMainTexture, y0,
-    x1 - (xm + ((x1 - xm) div wMainTexture) * wMainTexture), y1 - y0,
-    MainTexture.Image.Canvas, 0, hMainTexture div 2 + Band(
-    (x1 - xm) div wMainTexture) * (y1 - y0));
-  for I := 0 to (xm - x0) div wMainTexture - 1 do
-    BitBltCanvas(ca, xm - (I + 1) * wMainTexture, y0, wMainTexture, y1 - y0,
-      MainTexture.Image.Canvas, 0, hMainTexture div 2 +
+  BitBltCanvas(ca, xm + ((x1 - xm) div MainTexture.Width) * MainTexture.Width, y0,
+    x1 - (xm + ((x1 - xm) div MainTexture.Width) * MainTexture.Width), y1 - y0,
+    MainTexture.Image.Canvas, 0, MainTexture.Height div 2 + Band(
+    (x1 - xm) div MainTexture.Width) * (y1 - y0));
+  for I := 0 to (xm - x0) div MainTexture.Width - 1 do
+    BitBltCanvas(ca, xm - (I + 1) * MainTexture.Width, y0, MainTexture.Width, y1 - y0,
+      MainTexture.Image.Canvas, 0, MainTexture.Height div 2 +
       Band(-I - 1) * (y1 - y0));
-  BitBltCanvas(ca, x0, y0, xm - ((xm - x0) div wMainTexture) *
-    wMainTexture - x0, y1 - y0, MainTexture.Image.Canvas,
-    ((xm - x0) div wMainTexture + 1) * wMainTexture - (xm - x0),
-    hMainTexture div 2 + Band(-(xm - x0) div wMainTexture - 1) * (y1 - y0));
+  BitBltCanvas(ca, x0, y0, xm - ((xm - x0) div MainTexture.Width) *
+    MainTexture.Width - x0, y1 - y0, MainTexture.Image.Canvas,
+    ((xm - x0) div MainTexture.Width + 1) * MainTexture.Width - (xm - x0),
+    MainTexture.Height div 2 + Band(-(xm - x0) div MainTexture.Width - 1) * (y1 - y0));
 end;
 
@@ -1185 +1196 @@
 procedure PaintBackground(Form: TForm; Left, Top, Width, Height: Integer);
 begin
-  Fill(Form.Canvas, Left, Top, Width, Height, (wMainTexture - Form.ClientWidth) div
-    2, (hMainTexture - Form.ClientHeight) div 2);
-end;
-
-procedure Corner(ca: TCanvas; x, y, Kind: Integer; const T: TTexture);
+  Fill(Form.Canvas, Left, Top, Width, Height, (MainTexture.Width - Form.ClientWidth) div
+    2, (MainTexture.Height - Form.ClientHeight) div 2);
+end;
+
+procedure Corner(ca: TCanvas; x, y, Kind: Integer; T: TTexture);
 begin
   { BitBltCanvas(ca,x,y,8,8,T.HGr.Mask.Canvas,
@@ -1284 +1295 @@
 end;
 
-procedure LoweredTextOut(ca: TCanvas; cl: TColor; const T: TTexture;
+procedure LoweredTextOut(ca: TCanvas; cl: TColor; T: TTexture;
   x, y: Integer; s: string);
 begin
   if cl = -2 then
-    BiColorTextOut(ca, (T.clBevelShade and $FEFEFE) shr 1,
-      T.clBevelLight, x, y, s)
+    BiColorTextOut(ca, (T.ColorBevelShade and $FEFEFE) shr 1,
+      T.ColorBevelLight, x, y, s)
   else if cl < 0 then
-    BiColorTextOut(ca, T.clTextShade, T.clTextLight, x, y, s)
+    BiColorTextOut(ca, T.ColorTextShade, T.ColorTextLight, x, y, s)
   else
-    BiColorTextOut(ca, cl, T.clTextLight, x, y, s);
+    BiColorTextOut(ca, cl, T.ColorTextLight, x, y, s);
 end;
 
@@ -1368 +1379 @@
 procedure UnderlinedTitleValue(Canvas: TCanvas; Title, Value: string; X, Y, Width: Integer);
 begin
-  DLine(Canvas, X, X + Width, Y + 19, MainTexture.clBevelLight, MainTexture.clBevelShade);
+  DLine(Canvas, X, X + Width, Y + 19, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
   RisedTextOut(Canvas, X, Y, Title);
   RisedTextOut(Canvas, X + Width - BiColorTextWidth(Canvas, Value), Y, Value);
@@ -1374 +1385 @@
 
 procedure NumberBar(dst: TBitmap; x, y: integer; Cap: string;
-  val: Integer; const T: TTexture);
+  val: Integer; T: TTexture);
 var
   s: string;
@@ -1380 +1391 @@
   if val > 0 then
   begin
-    DLine(dst.Canvas, x - 2, x + 170, y + 16, T.clBevelShade,
-      T.clBevelLight);
+    DLine(dst.Canvas, x - 2, x + 170, y + 16, T.ColorBevelShade,
+      T.ColorBevelLight);
     LoweredTextOut(dst.Canvas, -1, T, x - 2, y, Cap);
     s := IntToStr(val);
@@ -1390 +1401 @@
 
 procedure CountBar(dst: TBitmap; x, y, w: Integer; Kind: Integer;
-  Cap: string; val: Integer; const T: TTexture);
+  Cap: string; val: Integer; T: TTexture);
 var
   i, sd, ld, cl, xIcon, yIcon: Integer;
@@ -1403 +1414 @@
     // xIcon:=x+100;
     // yIcon:=y;
-    // DLine(dst.Canvas,x-2,x+170+32,y+16,T.clBevelShade,T.clBevelLight);
+    // DLine(dst.Canvas,x-2,x+170+32,y+16,T.ColorBevelShade,T.ColorBevelLight);
 
     xIcon := x - 5;
     yIcon := y + 15;
-    DLine(dst.Canvas, x - 2, xIcon + w + 2, yIcon + 16, T.clBevelShade,
-      T.clBevelLight);
+    DLine(dst.Canvas, x - 2, xIcon + w + 2, yIcon + 16, T.ColorBevelShade,
+      T.ColorBevelLight);
 
     s := IntToStr(val);
@@ -1486 +1497 @@
 
 procedure PaintProgressBar(ca: TCanvas; Kind, x, y, pos, Growth, max: Integer;
-  const T: TTexture);
+  T: TTexture);
 var
   i: Integer;
@@ -1504 +1515 @@
     Growth := max - pos;
   Frame(ca, x - 1, y - 1, x + max, y + 7, $000000, $000000);
-  RFrame(ca, x - 2, y - 2, x + max + 1, y + 8, T.clBevelShade,
-    T.clBevelLight);
+  RFrame(ca, x - 2, y - 2, x + max + 1, y + 8, T.ColorBevelShade,
+    T.ColorBevelLight);
   with ca do
   begin
@@ -1540 +1551 @@
 procedure PaintRelativeProgressBar(ca: TCanvas;
   Kind, x, y, size, pos, Growth, max: Integer; IndicateComplete: Boolean;
-  const T: TTexture);
+  T: TTexture);
 begin
   if Growth > 0 then
@@ -1559 +1570 @@
     LightColor, ShadeColor);
   BitBltCanvas(Canvas, X, Y, Logo.Width, Logo.Height, LogoBuffer.Canvas, 0, 0);
-end;
-
-function SetMainTextureByAge(Age: Integer): Boolean;
-begin
-  if Age <> MainTextureAge then
-    with MainTexture do begin
-      MainTextureAge := Age;
-      LoadGraphicFile(Image, GetGraphicsDir + DirectorySeparator +
-        'Texture' + IntToStr(Age + 1) + '.jpg');
-      clBevelLight := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelLight];
-      clBevelShade := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelShade];
-      clTextLight := Colors.Canvas.Pixels[clkAge0 + Age, cliTextLight];
-      clTextShade := Colors.Canvas.Pixels[clkAge0 + Age, cliTextShade];
-      clLitText := Colors.Canvas.Pixels[clkAge0 + Age, cliLitText];
-      clMark := Colors.Canvas.Pixels[clkAge0 + Age, cliMark];
-      clPage := Colors.Canvas.Pixels[clkAge0 + Age, cliPage];
-      clCover := Colors.Canvas.Pixels[clkAge0 + Age, cliCover];
-      Result := True;
-    end
-  else
-    Result := False;
 end;
 
@@ -1795 +1785 @@
   BigImp := TBitmap.Create;
   BigImp.PixelFormat := pf24bit;
-  MainTexture.Image := TBitmap.Create;
-  MainTextureAge := -2;
+  MainTexture := TTexture.Create;
   ClickFrameColor := HGrSystem.Data.Canvas.Pixels[187, 175];
   InitOrnamentDone := False;
@@ -1819 +1808 @@
   FreeAndNil(Paper);
   FreeAndNil(Colors);
-  FreeAndNil(MainTexture.Image);
+  FreeAndNil(MainTexture);
+end;
+
+{ TTexture }
+
+procedure TTexture.SetAge(AValue: Integer);
+begin
+  if FAge = AValue then Exit;
+  FAge := AValue;
+  LoadGraphicFile(Image, GetGraphicsDir + DirectorySeparator +
+    'Texture' + IntToStr(Age + 1) + '.jpg');
+  ColorBevelLight := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelLight];
+  ColorBevelShade := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelShade];
+  ColorTextLight := Colors.Canvas.Pixels[clkAge0 + Age, cliTextLight];
+  ColorTextShade := Colors.Canvas.Pixels[clkAge0 + Age, cliTextShade];
+  ColorLitText := Colors.Canvas.Pixels[clkAge0 + Age, cliLitText];
+  ColorMark := Colors.Canvas.Pixels[clkAge0 + Age, cliMark];
+  ColorPage := Colors.Canvas.Pixels[clkAge0 + Age, cliPage];
+  ColorCover := Colors.Canvas.Pixels[clkAge0 + Age, cliCover];
+end;
+
+function TTexture.GetHeight: Integer;
+begin
+  Result := Image.Height;
+end;
+
+function TTexture.GetWidth: Integer;
+begin
+  Result := Image.Width;
+end;
+
+constructor TTexture.Create;
+begin
+  Image := TBitmap.Create;
+  FAge := -2;
+end;
+
+destructor TTexture.Destroy;
+begin
+  FreeAndNil(Image);
+  inherited;
+end;
+
+procedure TTexture.Assign(Source: TTexture);
+begin
+  FAge := Source.FAge;
+  Image.Assign(Image);
+  ColorBevelLight := Source.ColorBevelLight;
+  ColorBevelShade := Source.ColorBevelShade;
+  ColorTextLight := Source.ColorTextLight;
+  ColorTextShade := Source.ColorTextShade;
+  ColorLitText := Source.ColorLitText;
+  ColorMark := Source.ColorMark;
+  ColorPage := Source.ColorPage;
+  ColorCover := Source.ColorCover;
 end;