@codingame/monaco-vscode-workbench-service-override 2.2.1 → 3.0.0

package/index.d.ts

@@ -1,13 +1,13 @@
 export { default } from './workbench.js';
 export { IView, SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-export { CustomViewOption, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+export { CustomViewOption, EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
 export { IViewContainerDescriptor, IViewDescriptor, ViewContainer, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 export { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { ConfirmResult } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 export { EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInputCapabilities, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';

package/index.js

@@ -2,12 +2,12 @@ export { default } from './workbench.js';
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 export { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
-export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
+export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 export { SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,19 +18,19 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-keybindings-service-override": "2.2.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.1",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "2.2.1",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "2.2.1",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "2.2.1",
-    "@codingame/monaco-vscode-view-banner-service-override": "2.2.1",
-    "@codingame/monaco-vscode-files-service-override": "2.2.1",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.1",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.1",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.1",
-    "@codingame/monaco-vscode-host-service-override": "2.2.1",
-    "@codingame/monaco-vscode-base-service-override": "2.2.1"
+    "@codingame/monaco-vscode-keybindings-service-override": "3.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "3.0.0",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "3.0.0",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "3.0.0",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "3.0.0",
+    "@codingame/monaco-vscode-view-banner-service-override": "3.0.0",
+    "@codingame/monaco-vscode-files-service-override": "3.0.0",
+    "@codingame/monaco-vscode-extensions-service-override": "3.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "3.0.0",
+    "@codingame/monaco-vscode-layout-service-override": "3.0.0",
+    "@codingame/monaco-vscode-host-service-override": "3.0.0",
+    "@codingame/monaco-vscode-base-service-override": "3.0.0"
   }
 }

package/tools/views.d.ts

@@ -4,11 +4,10 @@ import { BrandedService, ServicesAccessor } from 'vscode/vscode/vs/platform/inst
 import { IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Dimension } from 'vscode/vscode/vs/base/browser/dom';
 import { Event } from 'vscode/vscode/vs/base/common/event';
+import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IEditorOptions } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { Parts, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -20,19 +19,20 @@ export { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/com
 import { IEditorOpenContext, EditorInputCapabilities, Verbosity, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
 export { EditorInputCapabilities, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 
 type Label = string | {
     short: string;
     medium: string;
     long: string;
 };
-declare abstract class SimpleEditorPane extends EditorPane {
+declare abstract class InjectedEditorPane extends EditorPane {
+    constructor(id: string);
+}
+declare abstract class SimpleEditorPane extends InjectedEditorPane {
     protected container: HTMLElement;
     protected wrapper: HTMLElement;
-    private scrollbar;
+    protected scrollbar: DomScrollableElement | undefined;
     private inputDisposable;
-    constructor(id: string, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
     protected createEditor(parent: HTMLElement): void;
     setInput(input: EditorInput, editorOptions: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
     layout(dimension: Dimension): void;
@@ -73,7 +73,7 @@ interface CustomViewOption {
     readonly id: string;
     name: string;
     order?: number;
-    renderBody(container: HTMLElement): IDisposable;
+    renderBody(container: HTMLElement, scrollbar: DomScrollableElement): IDisposable;
     location: ViewContainerLocation;
     icon?: string;
     canMoveView?: boolean;
@@ -102,4 +102,4 @@ declare function getPanelPosition(): Position;
 declare const onDidChangeSideBarPosition: Event<string>;
 declare function getSideBarPosition(): Position;
 
-export { type CustomViewOption, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };
+export { type CustomViewOption, InjectedEditorPane as EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/tools/views.js

@@ -1,4 +1,3 @@
-import { __decorate, __param } from '../external/tslib/tslib.es6.js';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
@@ -22,11 +21,11 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { BaseActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { assertIsDefined, assertAllDefined } from 'vscode/vscode/vs/base/common/types';
 export { ConfirmResult } from '../override/vs/platform/dialogs/common/dialogs.js';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -34,9 +33,14 @@ export { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layout
 import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 import { withReadyServices } from 'vscode/services';
 
-let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
-    constructor(id, telemetryService, themeService, storageService) {
-        super(id, telemetryService, themeService, storageService);
+class InjectedEditorPane extends EditorPane {
+    constructor(id) {
+        super(id, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService));
+    }
+}
+class SimpleEditorPane extends InjectedEditorPane {
+    constructor() {
+        super(...arguments);
         this.inputDisposable = this._register(new MutableDisposable());
     }
     createEditor(parent) {
@@ -76,12 +80,7 @@ let SimpleEditorPane = class SimpleEditorPane extends EditorPane {
         this.inputDisposable.clear();
         super.clearInput();
     }
-};
-SimpleEditorPane = __decorate([
-    ( __param(1, ITelemetryService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IStorageService))
-], SimpleEditorPane);
+}
 class SimpleEditorInput extends EditorInput {
     constructor(resource, closeHandler) {
         super();
@@ -182,13 +181,13 @@ function registerCustomView(options) {
             ctorDescriptor: new SyncDescriptor(class extends ViewPane {
                 renderBody(container) {
                     super.renderBody(container);
+                    this.wrapper = document.createElement('div');
+                    this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
                     this.container = $('.view-pane-content');
                     this.container.style.display = 'flex';
                     this.container.style.alignItems = 'stretch';
-                    this._register(options.renderBody(this.container));
-                    this.wrapper = document.createElement('div');
+                    this._register(options.renderBody(this.container, this.scrollbar));
                     this.wrapper.append(this.container);
-                    this.scrollbar = this._register(new DomScrollableElement(this.wrapper, { horizontal: 1 , vertical: 1  }));
                     container.appendChild(this.scrollbar.getDomNode());
                     const observer = new ResizeObserver(() => {
                         assertIsDefined(this.scrollbar).scanDomNode();
@@ -278,4 +277,4 @@ function getSideBarPosition() {
     return StandaloneServices.get(IWorkbenchLayoutService).getSideBarPosition();
 }
 
-export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };
+export { InjectedEditorPane as EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry };

package/vscode/src/vs/workbench/browser/layout.js

@@ -3,11 +3,11 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { getClientArea, getActiveDocument, getWindows, getWindow, addDisposableListener, EventType, isActiveDocument, getWindowId, getActiveWindow, getActiveElement, isAncestorUsingFlowTo, focusWindow, position, size, computeScreenAwareSize } from 'vscode/vscode/vs/base/browser/dom';
 import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from 'vscode/vscode/vs/base/browser/browser';
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
-import { isWindows, isLinux, isWeb, isMacintosh, isNative, isIOS } from 'vscode/vscode/vs/base/common/platform';
+import { isWindows, isLinux, isWeb, isIOS, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { pathsToEditors, isResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
 import { SidebarPart } from 'vscode/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
 import { PanelPart } from 'vscode/vscode/vs/workbench/browser/parts/panel/panelPart';
-import { positionFromString, positionToString, panelOpensMaximizedFromString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { positionFromString, positionToString, shouldShowCustomTitleBar, panelOpensMaximizedFromString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkspaceContextService, isTemporaryWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IStorageService, WillSaveStateReason } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
@@ -53,6 +53,15 @@ var LayoutClasses;
     LayoutClasses["MAXIMIZED"] = "maximized";
     LayoutClasses["WINDOW_BORDER"] = "border";
 })(LayoutClasses || (LayoutClasses = {})));
+const TITLE_BAR_SETTINGS = [
+    "workbench.activityBar.location" ,
+    "window.commandCenter" ,
+    "workbench.editor.editorActionsLocation" ,
+    "workbench.layoutControl.enabled" ,
+    'window.menuBarVisibility',
+    "window.titleBarStyle" ,
+    "window.customTitleBarVisibility" ,
+];
 class Layout extends Disposable {
     get activeContainer() { return this.getContainerFromDocument(getActiveDocument()); }
     get containers() {
@@ -115,8 +124,8 @@ class Layout extends Disposable {
         this.parent = parent;
         this._onDidChangeZenMode = this._register(( new Emitter()));
         this.onDidChangeZenMode = this._onDidChangeZenMode.event;
-        this._onDidChangeCenteredLayout = this._register(( new Emitter()));
-        this.onDidChangeCenteredLayout = this._onDidChangeCenteredLayout.event;
+        this._onDidChangeMainEditorCenteredLayout = this._register(( new Emitter()));
+        this.onDidChangeMainEditorCenteredLayout = this._onDidChangeMainEditorCenteredLayout.event;
         this._onDidChangePanelAlignment = this._register(( new Emitter()));
         this.onDidChangePanelAlignment = this._onDidChangePanelAlignment.event;
         this._onDidChangeWindowMaximized = this._register(( new Emitter()));
@@ -182,19 +191,13 @@ class Layout extends Disposable {
         this.editorGroupService.whenRestored.then(() => {
             this._register(this.mainPartEditorService.onDidVisibleEditorsChange(showEditorIfHidden));
             this._register(this.editorGroupService.mainPart.onDidActivateGroup(showEditorIfHidden));
-            this._register(this.mainPartEditorService.onDidActiveEditorChange(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_CENTERED))));
+            this._register(this.mainPartEditorService.onDidActiveEditorChange(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))));
         });
         this._register(this.configurationService.onDidChangeConfiguration((e) => {
             if (( [
-                "workbench.activityBar.location" ,
-                "window.commandCenter" ,
-                "workbench.editor.editorActionsLocation" ,
-                "workbench.layoutControl.enabled" ,
+                ...TITLE_BAR_SETTINGS,
                 LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION,
                 LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE,
-                'window.menuBarVisibility',
-                "window.titleBarStyle" ,
-                "window.customTitleBarVisibility" ,
             ].some(setting => e.affectsConfiguration(setting)))) {
                 const activityBarMovedToTop = e.affectsConfiguration("workbench.activityBar.location" ) && this.configurationService.getValue("workbench.activityBar.location" ) === "top" ;
                 const editorActionsMovedToTitlebar = e.affectsConfiguration("workbench.editor.editorActionsLocation" ) && this.configurationService.getValue("workbench.editor.editorActionsLocation" ) === "titleBar" ;
@@ -207,9 +210,9 @@ class Layout extends Disposable {
             }
         }));
         this._register(onDidChangeFullscreen(windowId => this.onFullscreenChanged(windowId)));
-        this._register(this.editorGroupService.mainPart.onDidAddGroup(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_CENTERED))));
-        this._register(this.editorGroupService.mainPart.onDidRemoveGroup(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_CENTERED))));
-        this._register(this.editorGroupService.mainPart.onDidChangeGroupMaximized(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_CENTERED))));
+        this._register(this.editorGroupService.mainPart.onDidAddGroup(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))));
+        this._register(this.editorGroupService.mainPart.onDidRemoveGroup(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))));
+        this._register(this.editorGroupService.mainPart.onDidChangeGroupMaximized(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))));
         this._register(addDisposableListener(this.mainContainer, EventType.SCROLL, () => this.mainContainer.scrollTop = 0));
         const showingCustomMenu = (isWindows || isLinux || isWeb) && !hasNativeTitlebar(this.configurationService);
         if (showingCustomMenu) {
@@ -234,10 +237,10 @@ class Layout extends Disposable {
             this.state.runtime.menuBar.toggled = visible;
             const menuBarVisibility = getMenuBarVisibility(this.configurationService);
             if (isWeb && menuBarVisibility === 'toggle') {
-                this.workbenchGrid.setViewVisible(this.titleBarPartView, this.shouldShowTitleBar());
+                this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
             }
             else if (this.state.runtime.mainWindowFullscreen && (menuBarVisibility === 'toggle' || menuBarVisibility === 'classic')) {
-                this.workbenchGrid.setViewVisible(this.titleBarPartView, this.shouldShowTitleBar());
+                this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
             }
             this.handleContainerDidLayout(this.mainContainer, this._mainContainerDimension);
         }
@@ -269,7 +272,7 @@ class Layout extends Disposable {
         }
         this.workbenchGrid.edgeSnapping = this.state.runtime.mainWindowFullscreen;
         {
-            this.workbenchGrid.setViewVisible(this.titleBarPartView, this.shouldShowTitleBar());
+            this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
             this.updateWindowsBorder(true);
         }
     }
@@ -295,7 +298,7 @@ class Layout extends Disposable {
         this.updateCustomTitleBarVisibility();
         this.updateMenubarVisibility(!!skipLayout);
         this.editorGroupService.whenRestored.then(() => {
-            this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_CENTERED), skipLayout);
+            this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED), skipLayout);
         });
     }
     setSideBarPosition(position) {
@@ -683,7 +686,7 @@ class Layout extends Disposable {
             this.stateModel.setRuntimeValue(LayoutStateKeys.ZEN_MODE_ACTIVE, !restoreZenMode);
             this.toggleZenMode(false, true);
         }
-        if (this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_CENTERED)) {
+        if (this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED)) {
             this.centerMainEditorLayout(true, true);
         }
         Promises.settled(layoutReadyPromises).finally(() => {
@@ -796,7 +799,7 @@ class Layout extends Disposable {
         }
         switch (part) {
             case "workbench.parts.titlebar" :
-                return this.shouldShowTitleBar();
+                return shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled);
             case "workbench.parts.sidebar" :
                 return !this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN);
             case "workbench.parts.panel" :
@@ -813,58 +816,6 @@ class Layout extends Disposable {
                 return false;
         }
     }
-    shouldShowTitleBar() {
-        const nativeTitleBarEnabled = hasNativeTitlebar(this.configurationService);
-        const showCustomTitleBar = this.configurationService.getValue("window.customTitleBarVisibility" );
-        if (showCustomTitleBar === "never"  && nativeTitleBarEnabled || showCustomTitleBar === "windowed"  && this.state.runtime.mainWindowFullscreen) {
-            return false;
-        }
-        if (!this.isTitleBarEmpty()) {
-            return true;
-        }
-        if (nativeTitleBarEnabled) {
-            return false;
-        }
-        if (isMacintosh && isNative) {
-            return !this.state.runtime.mainWindowFullscreen;
-        }
-        if (isNative && !this.state.runtime.mainWindowFullscreen) {
-            return true;
-        }
-        if (isWCOEnabled() && !this.state.runtime.mainWindowFullscreen) {
-            return true;
-        }
-        switch (getMenuBarVisibility(this.configurationService)) {
-            case 'classic':
-                return !this.state.runtime.mainWindowFullscreen || this.state.runtime.menuBar.toggled;
-            case 'compact':
-            case 'hidden':
-                return false;
-            case 'toggle':
-                return this.state.runtime.menuBar.toggled;
-            case 'visible':
-                return true;
-            default:
-                return isWeb ? false : !this.state.runtime.mainWindowFullscreen || this.state.runtime.menuBar.toggled;
-        }
-    }
-    isTitleBarEmpty() {
-        if (this.configurationService.getValue("window.commandCenter" )) {
-            return false;
-        }
-        if (this.configurationService.getValue("workbench.activityBar.location" ) === "top" ) {
-            return false;
-        }
-        const editorActionsLocation = this.configurationService.getValue("workbench.editor.editorActionsLocation" );
-        const editorTabsMode = this.configurationService.getValue("workbench.editor.showTabs" );
-        if (editorActionsLocation === "titleBar"  || editorActionsLocation === "default"  && editorTabsMode === "none" ) {
-            return false;
-        }
-        if (this.configurationService.getValue("workbench.layoutControl.enabled" )) {
-            return false;
-        }
-        return true;
-    }
     shouldShowBannerFirst() {
         return isWeb && !isWCOEnabled();
     }
@@ -1109,10 +1060,10 @@ class Layout extends Disposable {
         }
     }
     isMainEditorLayoutCentered() {
-        return this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_CENTERED);
+        return this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED);
     }
     centerMainEditorLayout(active, skipLayout) {
-        this.stateModel.setRuntimeValue(LayoutStateKeys.EDITOR_CENTERED, active);
+        this.stateModel.setRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED, active);
         const activeMainEditor = this.mainPartEditorService.activeEditor;
         let isEditorComplex = false;
         if (activeMainEditor instanceof DiffEditorInput) {
@@ -1132,7 +1083,7 @@ class Layout extends Disposable {
                 this.layout();
             }
         }
-        this._onDidChangeCenteredLayout.fire(this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_CENTERED));
+        this._onDidChangeMainEditorCenteredLayout.fire(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED));
     }
     resizePart(part, sizeChangeWidth, sizeChangeHeight) {
         const sizeChangePxWidth = Math.sign(sizeChangeWidth) * computeScreenAwareSize(getActiveWindow(), Math.abs(sizeChangeWidth));
@@ -1447,13 +1398,13 @@ class Layout extends Disposable {
         return this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_ALIGNMENT);
     }
     updateMenubarVisibility(skipLayout) {
-        const shouldShowTitleBar = this.shouldShowTitleBar();
+        const shouldShowTitleBar = shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled);
         if (!skipLayout && this.workbenchGrid && shouldShowTitleBar !== this.isVisible("workbench.parts.titlebar" , mainWindow)) {
             this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowTitleBar);
         }
     }
     updateCustomTitleBarVisibility() {
-        const shouldShowTitleBar = this.shouldShowTitleBar();
+        const shouldShowTitleBar = shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled);
         const titlebarVisible = this.isVisible("workbench.parts.titlebar" );
         if (shouldShowTitleBar !== titlebarVisible) {
             this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowTitleBar);
@@ -1572,7 +1523,7 @@ class Layout extends Disposable {
         if (bannerFirst !== shouldBannerBeFirst) {
             this.workbenchGrid.moveView(this.bannerPartView, Sizing.Distribute, this.titleBarPartView, shouldBannerBeFirst ? 0  : 1 );
         }
-        this.workbenchGrid.setViewVisible(this.titleBarPartView, this.shouldShowTitleBar());
+        this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
     }
     arrangeEditorNodes(nodes, availableHeight, availableWidth) {
         if (!nodes.sideBar && !nodes.auxiliaryBar) {
@@ -1797,7 +1748,7 @@ class InitializationStateKey extends WorkbenchLayoutStateKey {
     }
 }
 const LayoutStateKeys = {
-    EDITOR_CENTERED: ( new RuntimeStateKey(
+    MAIN_EDITOR_CENTERED: ( new RuntimeStateKey(
         'editor.centered',
         1 ,
         1 ,
@@ -2100,4 +2051,4 @@ class LayoutStateModel extends Disposable {
     }
 }
 
-export { Layout };
+export { Layout, TITLE_BAR_SETTINGS };

package/vscode/src/vs/workbench/browser/workbench.js

@@ -2,7 +2,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { addDisposableListener, runWhenWindowIdle } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter, setGlobalLeakWarningThreshold, Event } from 'vscode/vscode/vs/base/common/event';
 import { timeout, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
-import { PixelRatio, isChrome, isFirefox, isSafari } from 'vscode/vscode/vs/base/browser/browser';
+import { isChrome, isFirefox, isSafari } from 'vscode/vscode/vs/base/browser/browser';
 import { mark } from 'vscode/vscode/vs/base/common/performance';
 import { onUnexpectedError, setUnexpectedErrorHandler } from 'vscode/vscode/vs/base/common/errors';
 import { isNative, isMacintosh, isWeb, isWindows, isLinux } from 'vscode/vscode/vs/base/common/platform';
@@ -28,6 +28,9 @@ import { Layout } from './layout.js';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
 import '../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
+import { WorkbenchHoverDelegate } from 'vscode/vscode/vs/platform/hover/browser/hover';
+import { setHoverDelegateFactory } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegate';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 class Workbench extends Layout {
@@ -89,6 +92,7 @@ class Workbench extends Layout {
                 const hostService = accessor.get(IHostService);
                 const dialogService = accessor.get(IDialogService);
                 const notificationService = accessor.get(INotificationService);
+                setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {}));
                 this.initLayout(accessor);
                 this.registerListeners(lifecycleService, storageService, configurationService, hostService, dialogService);
                 this.renderWorkbench(instantiationService, notificationService, storageService, configurationService);
@@ -169,16 +173,16 @@ class Workbench extends Layout {
             try {
                 const storedFontInfo = JSON.parse(storedFontInfoRaw);
                 if (Array.isArray(storedFontInfo)) {
-                    FontMeasurements.restoreFontInfo(storedFontInfo);
+                    FontMeasurements.restoreFontInfo(mainWindow, storedFontInfo);
                 }
             }
             catch (err) {
             }
         }
-        FontMeasurements.readFontInfo(BareFontInfo.createFromRawSettings(configurationService.getValue('editor'), PixelRatio.value));
+        FontMeasurements.readFontInfo(mainWindow, BareFontInfo.createFromRawSettings(configurationService.getValue('editor'), PixelRatio.getInstance(mainWindow).value));
     }
     storeFontInfo(storageService) {
-        const serializedFontInfo = FontMeasurements.serializeFontInfo();
+        const serializedFontInfo = FontMeasurements.serializeFontInfo(mainWindow);
         if (serializedFontInfo) {
             storageService.store('editorFontInfo', JSON.stringify(serializedFontInfo), -1 , 1 );
         }

package/workbench.js

@@ -49,6 +49,8 @@ import { BrowserWindow } from 'vscode/vscode/vs/workbench/browser/window';
 import { detectFullscreen } from 'vscode/vscode/vs/base/browser/dom';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { setFullscreen } from 'vscode/vscode/vs/base/browser/browser';
+import { EditorPaneService } from 'vscode/vscode/vs/workbench/services/editor/browser/editorPaneService';
+import { IEditorPaneService } from 'vscode/vscode/vs/workbench/services/editor/common/editorPaneService';
 import getServiceOverride$3 from '@codingame/monaco-vscode-keybindings-service-override';
 import getServiceOverride$2 from '@codingame/monaco-vscode-quickaccess-service-override';
 import getServiceOverride$1 from '@codingame/monaco-vscode-bulk-edit-service-override';
@@ -58,6 +60,7 @@ import getServiceOverride$5 from '@codingame/monaco-vscode-view-status-bar-servi
 import getServiceOverride$6 from '@codingame/monaco-vscode-view-banner-service-override';
 import { getWorkbenchContainer } from 'vscode/workbench';
 import { onLayout, onRenderWorkbench } from 'vscode/lifecycle';
+import { registerAssets } from 'vscode/assets';
 import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands';
 import 'vscode/vscode/vs/workbench/contrib/files/browser/fileActions.contribution';
 import 'vscode/vscode/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
@@ -77,16 +80,15 @@ import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution';
 import 'vscode/vscode/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution';
 import 'vscode/vscode/vs/workbench/contrib/sash/browser/sash.contribution';
 import 'vscode/vscode/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';
-import { registerAssets } from 'vscode/assets';
-export { SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
+export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from './tools/views.js';
 export { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 export { ConfirmResult } from './override/vs/platform/dialogs/common/dialogs.js';
-export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 export { SplitView } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
+export { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 
 let webviewIframeAlternateDomains;
 registerAssets({
@@ -161,6 +163,7 @@ function getServiceOverride(options, _webviewIframeAlternateDomains) {
         [( IWebviewWorkbenchService.toString())]: new SyncDescriptor(WebviewEditorService, [], true),
         [( IProgressService.toString())]: new SyncDescriptor(ProgressService, [], true),
         [( IAuxiliaryWindowService.toString())]: new SyncDescriptor(BrowserAuxiliaryWindowService, [], true),
+        [( IEditorPaneService.toString())]: new SyncDescriptor(EditorPaneService, [], true),
         ...getServiceOverride$4(),
         ...getServiceOverride$5(),
         ...getServiceOverride$6()