Ensure ApplicationShellOptions are properly used for shell init

Fixes #12982

Author: martin-fleck-at

packages/core/src/browser/shell/application-shell.ts

@@ -266,12 +266,12 @@ export class ApplicationShell extends Widget {
         @inject(SidePanelHandlerFactory) protected readonly sidePanelHandlerFactory: () => SidePanelHandler,
         @inject(SplitPositionHandler) protected splitPositionHandler: SplitPositionHandler,
         @inject(FrontendApplicationStateService) protected readonly applicationStateService: FrontendApplicationStateService,
-        @inject(ApplicationShellOptions) @optional() options: RecursivePartial<ApplicationShell.Options> = {},
+        @inject(ApplicationShellOptions) @optional() protected shellOptions: RecursivePartial<ApplicationShell.Options> = {},
         @inject(CorePreferences) protected readonly corePreferences: CorePreferences,
         @inject(SaveResourceService) protected readonly saveResourceService: SaveResourceService,
         @inject(SecondaryWindowHandler) protected readonly secondaryWindowHandler: SecondaryWindowHandler,
     ) {
-        super(options as Widget.IOptions);
+        super(shellOptions as Widget.IOptions);
     }
 
     @postConstruct()
@@ -307,15 +307,15 @@ export class ApplicationShell extends Widget {
         this.options = {
             bottomPanel: {
                 ...ApplicationShell.DEFAULT_OPTIONS.bottomPanel,
-                ...this.options?.bottomPanel || {}
+                ...this.shellOptions?.bottomPanel || {}
             },
             leftPanel: {
                 ...ApplicationShell.DEFAULT_OPTIONS.leftPanel,
-                ...this.options?.leftPanel || {}
+                ...this.shellOptions?.leftPanel || {}
             },
             rightPanel: {
                 ...ApplicationShell.DEFAULT_OPTIONS.rightPanel,
-                ...this.options?.rightPanel || {}
+                ...this.shellOptions?.rightPanel || {}
             }
         };