Branch: FormBackgroundStyleHook

Components/BitmapImage.pas

@@ -331,7 +331,7 @@ procedure TBitmapImageImplementation.Paint(const Sender: TObject; const Canvas:
 
   var W, H: Integer;
   var Bmp: TBitmap;
-  if Stretch then begin
+  if Stretch and not Bitmap.Empty then begin
     W := R.Width;
     H := R.Height;
     Bmp := StretchedBitmap;
@@ -385,22 +385,25 @@ procedure TBitmapImageImplementation.Paint(const Sender: TObject; const Canvas:
     Canvas.Rectangle(0, 0, FControl.Width, FControl.Height);
   end;
 
-  var X := R.Left;
-  var Y := R.Top;
-  if Center then begin
-    Inc(X, (R.Width - W) div 2);
-    if X < 0 then
-      X := 0;
-    Inc(Y, (R.Height - H) div 2);
-    if Y < 0 then
-      Y := 0;
-  end;
 
-  if not Is32bit and (ReplaceColor <> clNone) and (ReplaceWithColor <> clNone) then begin
-    Canvas.Brush.Color := ReplaceWithColor;
-    Canvas.BrushCopy(Rect(X, Y, X + W, Y + H), Bmp, Rect(0, 0, Bmp.Width, Bmp.Height), ReplaceColor);
-  end else
-    Canvas.Draw(X, Y, Bmp);
+  if not Bitmap.Empty then begin
+    var X := R.Left;
+    var Y := R.Top;
+    if Center then begin
+      Inc(X, (R.Width - W) div 2);
+      if X < 0 then
+        X := 0;
+      Inc(Y, (R.Height - H) div 2);
+      if Y < 0 then
+        Y := 0;
+    end;
+
+    if not Is32bit and (ReplaceColor <> clNone) and (ReplaceWithColor <> clNone) then begin
+      Canvas.Brush.Color := ReplaceWithColor;
+      Canvas.BrushCopy(Rect(X, Y, X + W, Y + H), Bmp, Rect(0, 0, Bmp.Width, Bmp.Height), ReplaceColor);
+    end else
+      Canvas.Draw(X, Y, Bmp);
+  end;
 
   if Assigned(OnPaint) then
     OnPaint(Sender, Canvas, R);

Components/FormBackgroundStyleHook.pas

@@ -0,0 +1,97 @@
+unit FormBackgroundStyleHook;
+
+{
+  Inno Setup
+  Copyright (C) 1997-2025 Jordan Russell
+  Portions by Martijn Laan
+  For conditions of distribution and use, see LICENSE.TXT.
+
+  Style hook for custom form backgrounds
+}
+
+interface
+
+uses
+  Vcl.Forms, Vcl.Controls, Vcl.Graphics {$IFDEF VCLSTYLES}, BitmapImage {$ENDIF};
+
+type
+  TFormBackgroundStyleHook = class(TFormStyleHook)
+{$IFDEF VCLSTYLES}
+  private
+    class constructor Create;
+    class destructor Destroy;
+    class var FBitmapImageImpl: TBitmapImageImplementation;
+    class var FBitmapImageImplInitialized: Boolean;
+    class var FGraphic: TGraphic;
+{$ENDIF}
+    class var FBackColor: TColor;
+    class var FGraphicTarget: TControl;
+    class procedure SetGraphic(Value: TGraphic); static;
+{$IFDEF VCLSTYLES}
+  protected
+    procedure PaintBackground(Canvas: TCanvas); override;
+{$ENDIF}
+  public
+    class property BackColor: TColor write FBackColor;
+    class property Graphic: TGraphic write SetGraphic;
+    class property GraphicTarget: TControl write FGraphicTarget;
+  end;
+
+implementation
+
+{$IFDEF VCLSTYLES}
+
+uses
+  System.Classes, System.SysUtils;
+
+{ TFormBackgroundStyleHook }
+
+class constructor TFormBackgroundStyleHook.Create;
+begin
+  FBackColor := clNone;
+end;
+
+class destructor TFormBackgroundStyleHook.Destroy;
+begin
+  if FBitmapImageImplInitialized then
+    FBitmapImageImpl.DeInit;
+  FGraphic.Free;
+end;
+
+procedure TFormBackgroundStyleHook.PaintBackground(Canvas: TCanvas);
+begin
+  var R := Rect(0, 0, Control.Width, Control.Height);
+
+  if (FGraphicTarget = Control) and (FBitmapImageImplInitialized or (FGraphic <> nil)) then begin
+    if not FBitmapImageImplInitialized then begin
+      FBitmapImageImpl.Init(Control);
+      FBitmapImageImpl.SetGraphic(FGraphic);
+      FreeAndNil(FGraphic);
+      FBitmapImageImplInitialized := True;
+    end;
+    FBitmapImageImpl.BackColor := FBackColor;
+    FBitmapImageImpl.Paint(Self, Canvas, R);
+  end else if FBackColor <> clNone then begin
+    Canvas.Brush.Color := FBackColor;
+    Canvas.FillRect(R);
+  end;
+end;
+
+{$ENDIF}
+
+class procedure TFormBackgroundStyleHook.SetGraphic(Value: TGraphic);
+begin
+{$IFDEF VCLSTYLES}
+  if not FBitmapImageImplInitialized then begin
+    if FGraphic <> nil then
+      FreeAndNil(FGraphic);
+    if Value <> nil then begin
+      FGraphic := TGraphicClass(Value.ClassType).Create;
+      FGraphic.Assign(Value);
+    end;
+  end;
+{$ENDIF}
+end;
+
+
+end.

Components/NewNotebook.pas

@@ -46,6 +46,7 @@   TNewNotebook = class(TWinControl)
     property DragMode;
     property Enabled;
     property Font;
+    property ParentBackground;
     property ParentColor;
     property ParentFont;
     property ParentShowHint;
@@ -86,6 +87,7 @@   TNewNotebookPage = class(TCustomControl)
     property Height stored False;
     property Left stored False;
     property PageIndex: Integer read GetPageIndex write SetPageIndex stored False;
+    property ParentBackground;
     property ParentColor;
     property ParentFont;
     property ParentShowHint;

Components/NewStaticText.pas

@@ -378,7 +378,8 @@ procedure TNewStaticText.SetWordWrap(Value: Boolean);
 
 { TNewStaticTextStyleHook - same as Vcl.StdCtrls' TStaticTextStyleHook
   except that it accesses the Control property as a TNewStaticText instead
-  of a TCustomStaticText or TStaticText }
+  of a TCustomStaticText or TStaticText, and that it uses the control's
+  Color property }
 
 type
   TControlAccess = class(TControl);
@@ -411,7 +412,7 @@ procedure TNewStaticTextStyleHook.Paint(Canvas: TCanvas);
       LStyle.DrawParentBackground(Handle, Canvas.Handle, Details, False);
       Canvas.Brush.Style := bsClear;
     end else {$ENDIF} begin
-      Canvas.Brush.Color := LStyle.GetStyleColor(scWindow);
+      Canvas.Brush.Color := TNewStaticText(Control).Color;
       Canvas.FillRect(R);
     end;
     Details := LStyle.GetElementDetails(States[Control.Enabled]);

Projects/Setup.dpr

@@ -106,6 +106,7 @@ uses
   Compression.SevenZipDLLDecoder.Interfaces in 'Src\Compression.SevenZipDLLDecoder.Interfaces.pas',
   Shared.EncryptionFunc in 'Src\Shared.EncryptionFunc.pas',
   UnsignedFunc in '..\Components\UnsignedFunc.pas',
-  Themes in '..\Components\Themes.pas';
+  Themes in '..\Components\Themes.pas',
+  FormBackgroundStyleHook in '..\Components\FormBackgroundStyleHook.pas';
 
 {$I Src\Setup.inc}

Projects/Setup.dproj

@@ -180,6 +180,7 @@
         <DCCReference Include="Src\Shared.EncryptionFunc.pas"/>
         <DCCReference Include="..\Components\UnsignedFunc.pas"/>
         <DCCReference Include="..\Components\Themes.pas"/>
+        <DCCReference Include="..\Components\FormBackgroundStyleHook.pas"/>
         <None Include="Src\Setup.inc"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>

Projects/SetupCustomStyle.dpr

@@ -108,7 +108,8 @@ uses
   UnsignedFunc in '..\Components\UnsignedFunc.pas',
   Vcl.Themes,
   Vcl.Styles,
-  Setup.TaskDialogForm in 'Src\Setup.TaskDialogForm.pas' {TaskDialogForm};
+  Setup.TaskDialogForm in 'Src\Setup.TaskDialogForm.pas' {TaskDialogForm},
+  FormBackgroundStyleHook in '..\Components\FormBackgroundStyleHook.pas';
 
 { The compiler may delete some of the resources included here }
 {$R Res\Setup.icon.dark.res}

Projects/SetupCustomStyle.dproj

@@ -182,6 +182,7 @@
         <DCCReference Include="Src\Setup.TaskDialogForm.pas">
             <Form>TaskDialogForm</Form>
         </DCCReference>
+        <DCCReference Include="..\Components\FormBackgroundStyleHook.pas"/>
         <None Include="Src\Setup.inc"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>

Projects/Src/Compiler.SetupCompiler.pas

@@ -3312,6 +3312,20 @@ procedure TSetupCompiler.EnumSetupProc(const Line: PChar; const Ext: Integer);
     ssWindowVisible: begin
         WarningsList.Add(Format(SCompilerEntryObsolete, ['Setup', KeyName]));
       end;
+    ssWizardBackColor: begin
+        try
+          SetupHeader.WizardBackColor := StringToColor(Value);
+        except
+          Invalid;
+        end;
+      end;
+    ssWizardBackColorDynamicDark: begin
+        try
+          SetupHeader.WizardBackColorDynamicDark := StringToColor(Value);
+        except
+          Invalid;
+        end;
+      end;
     ssWizardImageAlphaFormat: begin
         if CompareText(Value, 'none') = 0 then
           SetupHeader.WizardImageAlphaFormat := afIgnored
@@ -7931,6 +7945,8 @@ procedure TSetupCompiler.Compile;
     SetupHeader.WizardDarkStyle := wdsLight;
     SetupHeader.WizardSizePercentX := 120;
     SetupHeader.WizardSizePercentY := SetupHeader.WizardSizePercentX;
+    SetupHeader.WizardBackColor := clNone;
+    SetupHeader.WizardBackColorDynamicDark := clNone;
 
     { Read [Setup] section }
     EnumIniSection(EnumSetupProc, 'Setup', 0, True, True, '', False, False);
@@ -8110,6 +8126,9 @@ procedure TSetupCompiler.Compile;
     end;
     if shAlwaysUsePersonalGroup in SetupHeader.Options then
       UsedUserAreas.Add('AlwaysUsePersonalGroup');
+    if (SetupHeader.WizardBackColor <> clNone) or (SetupHeader.WizardBackColorDynamicDark <> clNone) then
+      if WizardStyleSpecial = '' then
+        WizardStyleSpecial := 'windows11';
     if WizardStyleSpecial <> '' then begin
       const BuiltinStyleFile = 'builtin:' + WizardStyleSpecial;
       if WizardStyleFile = '' then
@@ -8186,7 +8205,7 @@ procedure TSetupCompiler.Compile;
       WizardImages := CreateWizardImagesFromFiles('WizardImageFile', WizardImageFile);
       if SetupDirectiveLines[ssWizardImageBackColor] = 0 then
         SetupHeader.WizardImageBackColor := clWindow;
-    end else begin
+    end else if SetupDirectiveLines[ssWizardImageFile] = 0 then begin
       WizardImages := CreateWizardImagesFromResources(['WizardImage'], ['150'], IsForcedDark);
       if SetupDirectiveLines[ssWizardImageBackColor] = 0 then begin
         { The following colors were determined by using the ColorBlendRGB function to blend from the
@@ -8199,7 +8218,8 @@ procedure TSetupCompiler.Compile;
         else
           SetupHeader.WizardImageBackColor := IfThen(IsForcedDark, $3f3a2e, $f9f3e8); { Also see below }
       end;
-    end;
+    end else if SetupDirectiveLines[ssWizardImageBackColor] = 0 then
+      SetupHeader.WizardImageBackColor := clNone;
     LineNumber := SetupDirectiveLines[ssWizardSmallImageFile];
     AddStatus(Format(SCompilerStatusReadingFile, ['WizardSmallImageFile']));
     if WizardSmallImageFile <> '' then begin
@@ -8210,11 +8230,13 @@ procedure TSetupCompiler.Compile;
       WizardSmallImages := CreateWizardImagesFromFiles('WizardSmallImage', WizardSmallImageFile);
       if SetupDirectiveLines[ssWizardSmallImageBackColor] = 0 then
         SetupHeader.WizardSmallImageBackColor := clWindow;
-    end else begin
+    end else if SetupDirectiveLines[ssWizardSmallImageFile] = 0 then begin
       WizardSmallImages := CreateWizardImagesFromResources(['WizardSmallImage'], ['250'], IsForcedDark);
       if SetupDirectiveLines[ssWizardSmallImageBackColor] = 0 then
         SetupHeader.WizardSmallImageBackColor := clNone;
-    end;
+    end else if SetupDirectiveLines[ssWizardSmallImageBackColor] = 0 then
+      SetupHeader.WizardSmallImageBackColor := clNone;
+
     LineNumber := 0;
 
     { Read dark dynamic wizard images }
@@ -8225,22 +8247,24 @@ procedure TSetupCompiler.Compile;
         WizardImagesDynamicDark := CreateWizardImagesFromFiles('WizardImageFileDynamicDark', WizardImageFileDynamicDark);
         if SetupDirectiveLines[ssWizardImageBackColorDynamicDark] = 0 then
           SetupHeader.WizardImageBackColorDynamicDark := clWindow;
-      end else begin
+      end else if SetupDirectiveLines[ssWizardImageFileDynamicDark] = 0 then begin
         WizardImagesDynamicDark := CreateWizardImagesFromResources(['WizardImage'], ['150'], True);
         if SetupDirectiveLines[ssWizardImageBackColorDynamicDark] = 0 then
           SetupHeader.WizardImageBackColorDynamicDark := $3f3a2e; { See above }
-      end;
+      end else if SetupDirectiveLines[ssWizardImageBackColorDynamicDark] = 0 then
+        SetupHeader.WizardImageBackColorDynamicDark := clNone;
       LineNumber := SetupDirectiveLines[ssWizardSmallImageFileDynamicDark];
       AddStatus(Format(SCompilerStatusReadingFile, ['WizardSmallImageFileDynamicDark']));
       if WizardSmallImageFileDynamicDark <> '' then begin
         WizardSmallImagesDynamicDark := CreateWizardImagesFromFiles('WizardSmallImageDynamicDark', WizardSmallImageFileDynamicDark);
         if SetupDirectiveLines[ssWizardSmallImageBackColorDynamicDark] = 0 then
           SetupHeader.WizardSmallImageBackColorDynamicDark := clWindow;
-      end else begin
+      end else if SetupDirectiveLines[ssWizardSmallImageFileDynamicDark] = 0 then begin
         WizardSmallImagesDynamicDark := CreateWizardImagesFromResources(['WizardSmallImage'], ['250'], True);
         if SetupDirectiveLines[ssWizardSmallImageBackColorDynamicDark] = 0 then
           SetupHeader.WizardSmallImageBackColorDynamicDark := clNone;
-      end;
+      end else if SetupDirectiveLines[ssWizardSmallImageBackColorDynamicDark] = 0 then
+        SetupHeader.WizardSmallImageBackColorDynamicDark := clNone;
       LineNumber := 0;
     end;
 

Projects/Src/Setup.MainFunc.pas

@@ -141,7 +141,8 @@ interface
   InstallMode: (imNormal, imSilent, imVerySilent);
   HasIcons, IsWin64, Is64BitInstallMode, IsAdmin, IsPowerUserOrAdmin, IsAdminInstallMode,
     NeedPassword, NeedSerial, NeedsRestart, RestartSystem, IsWinDark, IsDarkInstallMode,
-    IsUninstaller, AllowUninstallerShutdown, AcceptedQueryEndSessionInProgress: Boolean;
+    IsUninstaller, AllowUninstallerShutdown, AcceptedQueryEndSessionInProgress,
+    CustomWizardBackground: Boolean;
   InstallDefaultDisableFsRedir, ScriptFuncDisableFsRedir: Boolean;
   InstallDefaultRegView: TRegView = rvDefault;
   HasCustomType, HasComponents, HasTasks: Boolean;
@@ -243,16 +244,16 @@ implementation
 
 uses
   ShellAPI, ShlObj, StrUtils, ActiveX, RegStr, Imaging.pngimage, Themes,
-  ChaCha20, ECDSA, ISSigFunc, BidiCtrls,
+  ChaCha20, ECDSA, ISSigFunc, BidiCtrls, PathFunc, FormBackgroundStyleHook,
   SetupLdrAndSetup.Messages, Shared.SetupMessageIDs, Setup.DownloadFileFunc, Setup.ExtractFileFunc,
-  SetupLdrAndSetup.InstFunc, Setup.InstFunc, Setup.RedirFunc, PathFunc,
+  SetupLdrAndSetup.InstFunc, Setup.InstFunc, Setup.RedirFunc,
   Compression.Base, Compression.Zlib, Compression.bzlib, Compression.LZMADecompressor,
   Shared.SetupEntFunc, Shared.EncryptionFunc,  Setup.SelectLanguageForm,
   Setup.WizardForm, Setup.DebugClient, Shared.VerInfoFunc, Setup.FileExtractor,
   Shared.FileClass, Setup.LoggingFunc, StringScanner,
   SimpleExpression, Setup.Helper, Setup.SpawnClient, Setup.SpawnServer,
   Setup.DotNetFunc, Shared.TaskDialogFunc, Setup.MainForm, Compression.SevenZipDecoder,
-  Compression.SevenZipDLLDecoder;
+  Compression.SevenZipDLLDecoder, Setup.SetupForm;
 
 var
   ShellFolders: array[Boolean, TShellFolderID] of String;
@@ -3327,6 +3328,7 @@ procedure InitializeSetup;
         if IsDynamicDark then begin
           SetupHeader.WizardImageBackColor := SetupHeader.WizardImageBackColorDynamicDark;
           SetupHeader.WizardSmallImageBackColor := SetupHeader.WizardSmallImageBackColorDynamicDark;
+          SetupHeader.WizardBackColor := SetupHeader.WizardBackColorDynamicDark;
           MainIconPostfix := '_DARK';
           WantWizardImagesDynamicDark := True; { Handled below }
         end;
@@ -3351,6 +3353,11 @@ procedure InitializeSetup;
             TStyleManager.SetStyle(Handle);
             if not IsDarkInstallMode and (shWizardLightButtonsUnstyled in SetupHeader.Options) then
               TNewButton.DontStyle := True;
+            CustomWizardBackground := SetupHeader.WizardBackColor <> clNone;
+            if CustomWizardBackground then begin
+              TCustomStyleEngine.RegisterStyleHook(TSetupForm, TFormBackgroundStyleHook);
+              TFormBackgroundStyleHook.BackColor := SetupHeader.WizardBackColor;
+            end;
           end;
         end;
 

Projects/Src/Setup.SelectLanguageForm.pas

@@ -94,7 +94,8 @@ constructor TSelectLanguageForm.Create(AOwner: TComponent);
 begin
   inherited;
 
-  MainPanel.ParentBackground := False;
+  if not CustomWizardBackground then
+    MainPanel.ParentBackground := False;
 
   InitializeFont(False, True);