From 5c20fe1ecc9eda8c6be5f512316182d342b145f7 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 22 Feb 2023 15:32:03 +0000
Subject: [PATCH] spktoolbar: Refactor TSpkPopupMenuAppearance.SaveToPascal.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8733 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../spktoolbar/SpkToolbar/spkt_Appearance.pas | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas
index f6c5ab570..00da27ed2 100644
--- a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas
+++ b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas
@@ -469,6 +469,11 @@ implementation
 uses
   LCLIntf, LCLType, typinfo, spkt_Const, spkGraphTools;
 
+function GradientTypeName(AGradientType: TBackgroundKind): String;
+begin
+  Result := GetEnumName(TypeInfo(TBackgroundKind), ord(AGradientType));
+end;
+
 procedure SaveFontToPascal(AList: TStrings; AFont: TFont; AName: String);
 var
   sty: String;
@@ -2128,31 +2133,31 @@ begin
     Add('  with Popup do begin');
     SaveFontToPascal(AList, FCaptionFont, '    CaptionFont');
 
-    Add('    CheckedFrameColor := $' + IntToHex(FCheckedFrameColor, 8) + ';');
-    Add('    CheckedGradientFromColor := $' + IntToHex(FCheckedGradientFromColor, 8) + ';');
-    Add('    CheckedGradientToColor := $' + IntToHex(FCheckedGradientToColor, 8) + ';');
-    Add('    CheckedGradientType := ' + GetEnumName(TypeInfo(TBackgroundKind), ord(FCheckedGradientType)) + ';');
+    Add('    CheckedFrameColor := $%.8x;', [FCheckedFrameColor]);
+    Add('    CheckedGradientFromColor := $%.8x;', [FCheckedGradientFromColor]);
+    Add('    CheckedGradientToColor := $%.8x;', [FCheckedGradientToColor]);
+    Add('    CheckedGradientType := %s;', [GradientTypeName(FCheckedGradientType)]);
 
-    Add('    DisabledCaptionColor := $' + IntToHex(FDisabledCaptionColor, 8) + ';');
-    Add('    DividerLineColor := $' + IntToHex(FDividerLineColor, 8) + ';');
+    Add('    DisabledCaptionColor := $%.8x;', [FDisabledCaptionColor]);
+    Add('    DividerLineColor := $%.8x;', [FDividerLineColor]);
 
-    Add('    IdleCaptionColor := $' + IntToHex(FIdleCaptionColor, 8) + ';');
-    Add('    IdleGradientFromColor := $' + IntToHex(FIdleGradientFromColor, 8) + ';');
-    Add('    IdleGradientToColor := $' + IntToHex(FIdleGradientToColor, 8) + ';');
-    Add('    IdleGradientType := ' + GetEnumName(TypeInfo(TBackgroundKind), ord(FIdleGradientType)) + ';');
+    Add('    GutterGradientFromColor := $%.8x;', [FGutterGradientFromColor]);
+    Add('    GutterGradientToColor := $%.8x;', [FGutterGradientToColor]);
+    Add('    GutterGradientType := %s;', [GradientTypeName(FGutterGradientType)]);
+    Add('    GutterLineColor := $%.8x;', [FGutterLineColor]);
 
-    Add('    GutterGradientFromColor := $' + IntToHex(FGutterGradientFromColor, 8) + ';');
-    Add('    GutterGradientToColor := $' + IntToHex(FGutterGradientToColor, 8) + ';');
-    Add('    GutterGradientType := ' + GetEnumName(TypeInfo(TBackgroundKind), ord(FGutterGradientType)) + ';');
-    Add('    GutterLineColor := $' + IntToHex(FGutterLineColor, 8) + ';');
+    Add('    IdleCaptionColor := $%.8x;', [FIdleCaptionColor]);
+    Add('    IdleGradientFromColor := $%.8x;', [FIdleGradientFromColor]);
+    Add('    IdleGradientToColor := $%.8x;', [FIdleGradientToColor]);
+    Add('    IdleGradientType := %s;', [GradientTypeName(FIdleGradientType)]);
 
-    Add('    HotTrackCaptionColor := $' + IntToHex(FHotTrackCaptionColor, 8) + ';');
-    Add('    HotTrackFrameColor := $' + IntToHex(FHotTrackFrameColor, 8) + ';');
-    Add('    HotTrackGradientFromColor := $' + IntToHex(FHotTrackGradientFromColor, 8) + ';');
-    Add('    HotTrackGradientToColor := $' + IntToHex(FHotTrackGradientToColor, 8) + ';');
-    Add('    HotTrackGradientType := ' + GetEnumName(TypeInfo(TBackgroundKind), ord(FHotTrackGradientType)) + ';');
+    Add('    HotTrackCaptionColor := $%.8x;', [FHotTrackCaptionColor]);
+    Add('    HotTrackFrameColor := $%.8x;', [FHotTrackFrameColor]);
+    Add('    HotTrackGradientFromColor := $%.8x;', [FHotTrackGradientFromColor]);
+    Add('    HotTrackGradientToColor := $%.8x;', [FHotTrackGradientToColor]);
+    Add('    HotTrackGradientType := %s;', [GradientTypeName(FHotTrackGradientType)]);
 
-    Add('    Style := ' + GetEnumName(TypeInfo(TSpkPopupStyle), ord(FStyle)) + ';');
+    Add('    Style := %s;', [GetEnumName(TypeInfo(TSpkPopupStyle), ord(FStyle))]);
     Add('  end;');
   end;
 end;