Changeset 514 for trunk/Start.pas

Timestamp:

Jan 3, 2024, 3:05:32 PM (11 months ago)

Author:

chronos

Message:

• Modified: LogoBuffer is in fact general DrawBuffer. Use single DrawBuffer for all units.
• Modified: Improved fractional scaling.

File:

• trunk/Start.pas (modified) (7 diffs)

trunk/Start.pas

@@ -114 +114 @@
     FormerGames: TStringList;
     Maps: TStringList;
-    LogoBuffer: TBitmap;
     // BookDate: string;
     PlayerSlots: TPlayerSlots;
@@ -181 +180 @@
   ActionSideBorder = 24;
   ActionBottomBorder = 10;
-  wBuffer = 91;
   x0Mini = 437;
   y0Mini = 178;
@@ -308 +306 @@
   EmptyPicture.SetSize(64, 64);
   EmptyPicture.Canvas.FillRect(0, 0, EmptyPicture.Width, EmptyPicture.Height);
-  LogoBuffer := TBitmap.Create;
-  LogoBuffer.PixelFormat := TPixelFormat.pf24bit;
-  LogoBuffer.SetSize(wBuffer, 56);
-  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
 
   MiniMap := TMiniMap.Create;
@@ -336 +330 @@
   FreeAndNil(Maps);
   FreeAndNil(EmptyPicture);
-  FreeAndNil(LogoBuffer);
   FreeAndNil(PlayerSlots);
   FreeAndNil(MiniMap);
@@ -537 +530 @@
     $000000, xAction, Y + 21, Phrases2.Lookup(TextItem));
 
-  UnshareBitmap(LogoBuffer);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, 50, 50, Canvas,
+  UnshareBitmap(DrawBuffer);
+  DrawBufferEnsureSize(50, 50);
+  BitBltCanvas(DrawBuffer.Canvas, 0, 0, 50, 50, Canvas,
     xActionIcon - 2, Y - 2);
-  GlowFrame(LogoBuffer, 8, 8, 34, 34, $202020);
+  GlowFrame(DrawBuffer, 8, 8, 34, 34, $202020);
   BitBltCanvas(Canvas, xActionIcon - 2, Y - 2, 50, 50,
-    LogoBuffer.Canvas, 0, 0);
+    DrawBuffer.Canvas, 0, 0);
   BitBltCanvas(Canvas, xActionIcon, Y, 40, 40, BigImp.Canvas,
     (IconIndex mod 7) * xSizeBig + 8, (IconIndex div 7) * ySizeBig);
@@ -637 +631 @@
 
   // Paint menu logo
-  UnshareBitmap(LogoBuffer);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, MenuLogo.Width, MenuLogo.Height, Canvas, 6,
+  UnshareBitmap(DrawBuffer);
+  DrawBufferEnsureSize(MenuLogo.Width, MenuLogo.Height);
+  BitBltCanvas(DrawBuffer.Canvas, 0, 0, MenuLogo.Width, MenuLogo.Height, Canvas, 6,
     3 + 2 * Integer(Tab <> tbMain));
 
-  ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, MenuLogo.Left, MenuLogo.Top,
+  ImageOp_BCC(DrawBuffer, Templates.Data, 0, 0, MenuLogo.Left, MenuLogo.Top,
     MenuLogo.Width, MenuLogo.Height - 9, $BFBF20, $4040DF); // logo part 1
-  ImageOp_BCC(LogoBuffer, Templates.Data, 10, 27, MenuLogo.Left + 10,
+  ImageOp_BCC(DrawBuffer, Templates.Data, 10, 27, MenuLogo.Left + 10,
     MenuLogo.Top + 27, MenuLogo.Width - 10, 9, $BFBF20, $4040DF); // logo part 2
   BitBltCanvas(Canvas, 6, 3 + 2 * Integer(Tab <> tbMain), MenuLogo.Width, MenuLogo.Height,
-    LogoBuffer.Canvas, 0, 0);
+    DrawBuffer.Canvas, 0, 0);
 
   if Page = pgMain then begin
-   if SelectedAction <> maNone then // mark selected action
-      for I := 0 to (ClientWidth - 2 * ActionSideBorder) div wBuffer + 1 do
-      begin
-        W := ClientWidth - 2 * ActionSideBorder - I * wBuffer;
-        if W > wBuffer then
-          W := wBuffer;
-        H := ActionPitch;
-        if yAction + Integer(SelectedAction) * ActionPitch - 8 + H > ClientHeight - ActionBottomBorder
-        then
-          H := ClientHeight - ActionBottomBorder -
-            (yAction + Integer(SelectedAction) * ActionPitch - 8);
-
-        UnshareBitmap(LogoBuffer);
-        BitBltCanvas(LogoBuffer.Canvas, 0, 0, W, H, Canvas,
-          ActionSideBorder + I * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
-          - 8);
-        MakeBlue(LogoBuffer, 0, 0, W, H);
-        BitBltCanvas(Canvas, ActionSideBorder + I * wBuffer,
-          yAction + Integer(SelectedAction) * ActionPitch - 8, W, H,
-          LogoBuffer.Canvas, 0, 0);
-      end;
+    if SelectedAction <> maNone then begin
+      // Mark selected action
+      W := ClientWidth - 2 * ActionSideBorder;
+      H := ActionPitch;
+      if yAction + Integer(SelectedAction) * ActionPitch - 8 + H > ClientHeight - ActionBottomBorder
+      then
+        H := ClientHeight - ActionBottomBorder -
+          (yAction + Integer(SelectedAction) * ActionPitch - 8);
+
+      UnshareBitmap(DrawBuffer);
+      DrawBufferEnsureSize(W, H);
+      BitBltCanvas(DrawBuffer.Canvas, 0, 0, W, H, Canvas,
+        ActionSideBorder, yAction + Integer(SelectedAction) * ActionPitch - 8);
+      MakeBlue(DrawBuffer, 0, 0, W, H);
+      BitBltCanvas(Canvas, ActionSideBorder, yAction + Integer(SelectedAction) *
+        ActionPitch - 8, W, H, DrawBuffer.Canvas, 0, 0);
+    end;
     Y := yAction;
     for MainAction := Low(TMainActionSet) to High(TMainActionSet) do
@@ -687 +678 @@
               Canvas.Font.Assign(UniFont[ftNormal]);
 
-              UnshareBitmap(LogoBuffer);
-              BitBltCanvas(LogoBuffer.Canvas, 0, 0, LinkArrows.Width, LinkArrows.Height, Canvas,
+              UnshareBitmap(DrawBuffer);
+              DrawBufferEnsureSize(LinkArrows.Width, LinkArrows.Height);
+              BitBltCanvas(DrawBuffer.Canvas, 0, 0, LinkArrows.Width, LinkArrows.Height, Canvas,
                 xActionIcon, Y + 2);
-              ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), LinkArrows.BoundsRect, 0,
+              ImageOp_BCC(DrawBuffer, Templates.Data, Point(0, 0), LinkArrows.BoundsRect, 0,
                 Colors.Canvas.Pixels[clkAge0 - 1, cliDimmedText]);
               BitBltCanvas(Canvas, xActionIcon, Y + 2, LinkArrows.Width, LinkArrows.Height,
-                LogoBuffer.Canvas, 0, 0);
+                DrawBuffer.Canvas, 0, 0);
             end;
         end;