@codingame/monaco-vscode-layout-service-override 1.85.0-next.2 → 1.85.1

package/layout.d.ts

@@ -1,5 +1,5 @@
 import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
-import { IWorkbenchLayoutService, Parts, PanelAlignment, Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { IWorkbenchLayoutService, Parts, Position, PanelAlignment } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { ILayoutService, ILayoutOffsetInfo } from 'vscode/vscode/vs/platform/layout/browser/layoutService';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { IDimension, Dimension } from 'vscode/vscode/vs/base/browser/dom';
@@ -18,6 +18,8 @@ declare class LayoutService extends Disposable implements ILayoutService, IWorkb
     private auxiliaryWindowService;
     private hostService;
     private activeContainerId;
+    private sideBarPosition;
+    private panelPosition;
     constructor(mainContainer?: HTMLElement);
     hasMainWindowBorder(): boolean;
     getMainWindowBorderRadius(): string | undefined;
@@ -56,7 +58,10 @@ declare class LayoutService extends Disposable implements ILayoutService, IWorkb
     onDidChangeZenMode: Event<any>;
     onDidChangeWindowMaximized: Event<any>;
     onDidChangeCenteredLayout: Event<any>;
-    onDidChangePanelPosition: Event<any>;
+    private readonly _onDidChangePanelPosition;
+    readonly onDidChangePanelPosition: Event<string>;
+    private readonly _onDidChangeSideBarPosition;
+    readonly onDidChangeSideBarPosition: Event<string>;
     onDidChangePanelAlignment: Event<any>;
     onDidChangeNotificationsVisibility: Event<any>;
     openedDefaultEditors: boolean;
@@ -69,11 +74,8 @@ declare class LayoutService extends Disposable implements ILayoutService, IWorkb
     focusPart(part: Parts): void;
     getDimension(part: Parts): Dimension | undefined;
     toggleMaximizedPanel(): void;
-    hasWindowBorder(): boolean;
-    getWindowBorderWidth(): number;
-    getWindowBorderRadius(): string | undefined;
     toggleMenuBar(): void;
-    setPanelPosition(): void;
+    setPanelPosition(position: Position): void;
     getPanelAlignment(): PanelAlignment;
     setPanelAlignment(): void;
     toggleZenMode(): void;
@@ -96,6 +98,7 @@ declare class LayoutService extends Disposable implements ILayoutService, IWorkb
     setPartHidden(hidden: boolean, part: Parts): void;
     isVisible(part: Parts): boolean;
     getSideBarPosition(): Position;
+    setSideBarPosition(position: Position): void;
     registerPart(part: Part): void;
     isRestored(): boolean;
     private _onDidChangePartVisibility;

package/layout.js

@@ -1,4 +1,5 @@
 import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { positionFromString, positionToString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
@@ -16,6 +17,7 @@ import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/aux
 import { StandaloneCodeEditor } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneCodeEditor.js';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
+import { getMenuBarVisibility, getTitleBarStyle } from 'vscode/vscode/vs/platform/window/common/window';
 import { onRenderWorkbench } from 'vscode/lifecycle';
 import { getWorkbenchContainer } from 'vscode/workbench';
 
@@ -41,7 +43,10 @@ class LayoutService extends Disposable {
         this.onDidChangeZenMode = Event.None;
         this.onDidChangeWindowMaximized = Event.None;
         this.onDidChangeCenteredLayout = Event.None;
-        this.onDidChangePanelPosition = Event.None;
+        this._onDidChangePanelPosition = this._register(new Emitter());
+        this.onDidChangePanelPosition = this._onDidChangePanelPosition.event;
+        this._onDidChangeSideBarPosition = this._register(new Emitter());
+        this.onDidChangeSideBarPosition = this._onDidChangeSideBarPosition.event;
         this.onDidChangePanelAlignment = Event.None;
         this.onDidChangeNotificationsVisibility = Event.None;
         this.openedDefaultEditors = false;
@@ -96,11 +101,19 @@ class LayoutService extends Disposable {
                 this.setPartHidden(this.isActivityBarHidden(), "workbench.parts.activitybar" );
             }
             if (e.affectsConfiguration('workbench.statusBar.visible')) {
-                this.setPartHidden(this.configurationService.getValue('workbench.statusBar.visible'), "workbench.parts.statusbar" );
+                this.setPartHidden(!this.configurationService.getValue('workbench.statusBar.visible'), "workbench.parts.statusbar" );
+            }
+            if (e.affectsConfiguration('workbench.sideBar.location')) {
+                this.setSideBarPosition(positionFromString(this.configurationService.getValue('workbench.sideBar.location') ?? 'left'));
+            }
+            if (e.affectsConfiguration('workbench.panel.defaultLocation')) {
+                this.setPanelPosition(positionFromString(this.configurationService.getValue('workbench.panel.defaultLocation') ?? 'bottom'));
             }
         }));
         this.setPartHidden(this.isActivityBarHidden(), "workbench.parts.activitybar" );
         this.setPartHidden(!this.configurationService.getValue('workbench.statusBar.visible'), "workbench.parts.statusbar" );
+        this.sideBarPosition = positionFromString(this.configurationService.getValue('workbench.sideBar.location') ?? 'left');
+        this.panelPosition = positionFromString(this.configurationService.getValue('workbench.panel.defaultLocation') ?? 'bottom');
         this._register(this.hostService.onDidChangeActiveWindow(() => this.onActiveWindowChanged()));
         this._register(this.auxiliaryWindowService.onDidOpenAuxiliaryWindow(({ window, disposables }) => {
             this._onDidAddContainer.fire({ container: window.container, disposables: new DisposableStore() });
@@ -166,18 +179,25 @@ class LayoutService extends Disposable {
     }
     toggleMaximizedPanel() {
     }
-    hasWindowBorder() {
-        return false;
-    }
-    getWindowBorderWidth() {
-        return 0;
-    }
-    getWindowBorderRadius() {
-        return undefined;
-    }
     toggleMenuBar() {
+        let currentVisibilityValue = getMenuBarVisibility(this.configurationService);
+        if (typeof currentVisibilityValue !== 'string') {
+            currentVisibilityValue = 'classic';
+        }
+        let newVisibilityValue;
+        if (currentVisibilityValue === 'visible' || currentVisibilityValue === 'classic') {
+            newVisibilityValue = getTitleBarStyle(this.configurationService) === 'native' ? 'toggle' : 'compact';
+        }
+        else {
+            newVisibilityValue = 'classic';
+        }
+        void this.configurationService.updateValue('window.menuBarVisibility', newVisibilityValue);
     }
-    setPanelPosition() {
+    setPanelPosition(position) {
+        this.panelPosition = position;
+        const panelPart = this.getPart("workbench.parts.panel" );
+        panelPart?.updateStyles();
+        this._onDidChangePanelPosition.fire(positionToString(position));
     }
     getPanelAlignment() {
         return 'left';
@@ -208,7 +228,7 @@ class LayoutService extends Disposable {
         return false;
     }
     getPanelPosition() {
-        return 2 ;
+        return this.panelPosition;
     }
     hasFocus(part) {
         const activeElement = document.activeElement;
@@ -277,7 +297,17 @@ class LayoutService extends Disposable {
         return !( this.hiddenParts.has(part));
     }
     getSideBarPosition() {
-        return 0 ;
+        return this.sideBarPosition;
+    }
+    setSideBarPosition(position) {
+        this.sideBarPosition = position;
+        const activityBar = this.getPart("workbench.parts.activitybar" );
+        const sideBar = this.getPart("workbench.parts.sidebar" );
+        const auxiliaryBar = this.getPart("workbench.parts.auxiliarybar" );
+        activityBar?.updateStyles();
+        sideBar?.updateStyles();
+        auxiliaryBar?.updateStyles();
+        this._onDidChangeSideBarPosition.fire(positionToString(position));
     }
     registerPart(part) {
         this.parts.set(part.getId(), part);
@@ -314,7 +344,7 @@ class LayoutService extends Disposable {
             }
         }
         else {
-            this.editorGroupService.getPart(activeContainer)?.activeGroup.focus();
+            this.editorGroupService.getPart(activeContainer).activeGroup.focus();
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-layout-service-override",
-  "version": "1.85.0-next.2",
+  "version": "1.85.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.1",
     "monaco-editor": "0.45.0"
   }
 }