Changeset 529 for trunk

Timestamp:

Jan 14, 2024, 12:07:05 AM (11 months ago)

Author:

chronos

Message:

• Fixed: First letter in help page titles were not correctly read as UTF8 character.

File:

• trunk/LocalPlayer/Help.pas (modified) (5 diffs)

trunk/LocalPlayer/Help.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType, Messages,
+  LazUTF8, Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType, Messages,
   SysUtils, Classes, ButtonB, PVSB, Types, Generics.Collections, IsoEngine,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Common,
@@ -380 +380 @@
   TextSize: TSize;
   S: string;
+  FirstLetter: string;
 begin
   S := MainText[ScrollBar.Position + I];
@@ -395 +396 @@
   begin
     ACanvas.Font.Assign(CaptionFont);
-    { ACanvas.brush.color:=CaptionColor;
-      ACanvas.FillRect(rect(X,I*24,X+24,I*24+24));
-      ACanvas.Brush.Color:=$FFFFFF;
-      ACanvas.FrameRect(rect(X+1,I*24+1,X+24-1,I*24+24-1));
-      ACanvas.Brush.Style:=bsClear; }
+    { ACanvas.Brush.Color := CaptionColor;
+      ACanvas.FillRect(Rect(X, I * 24, X + 24, I * 24 + 24));
+      ACanvas.Brush.Color := $FFFFFF;
+      ACanvas.FrameRect(Rect(X + 1, I * 24 + 1, X + 24 - 1, I * 24 + 24 - 1));
+      ACanvas.Brush.Style := bsClear; }
     BitBltCanvas(ACanvas, X, Y - 4, 24, 24, HGrSystem.Data.Canvas, 1,
       146);
-    BiColorTextOut(ACanvas, $FFFFFF, $7F007F, X + 10 - ACanvas.TextWidth(S[1]) div 2,
-      Y - 3, S[1]);
-    BiColorTextOut(ACanvas, CaptionColor, $7F007F, X + 24, Y - 3, Copy(S, 2, 255));
+    FirstLetter := UTF8Copy(S, 1, 1);
+    S := UTF8Copy(S, 2, MaxInt);
+    BiColorTextOut(ACanvas, $FFFFFF, $7F007F, X + 10 - ACanvas.TextWidth(FirstLetter) div 2,
+      Y - 3, FirstLetter);
+    BiColorTextOut(ACanvas, CaptionColor, $7F007F, X + 24, Y - 3, S);
     ACanvas.Font.Assign(UniFont[ftNormal]);
   end
@@ -1568 +1571 @@
         begin // complete nat. project list
           Caption := HelpText.Lookup('HELPTITLE_UNIQUELIST');
-          // AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'),pkSection);
+          // AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'), pkSection);
           for I := nWonder to nImp - 1 do
             if (Imp[I].Preq <> preNA) and
@@ -1576 +1579 @@
           { LineFeed;
             LineFeed;
-            AddLine(HelpText.Lookup('HELPTITLE_SHIPPARTLIST'),pkSection);
-            for I:= nWonder to nImp-1 do
-            if (Imp[I].Preq<>preNA) and (Imp[I].Kind=ikShipPart) then
-            AddLine(Phrases.Lookup('IMPROVEMENTS',I),pkSmallIcon,I,hkImp,I); }
+            AddLine(HelpText.Lookup('HELPTITLE_SHIPPARTLIST'), pkSection);
+            for I := nWonder to nImp - 1 do
+            if (Imp[I].Preq <> preNA) and (Imp[I].Kind = ikShipPart) then
+            AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon, I, hkImp, I); }
         end
         else if No = 202 then