@codingame/monaco-vscode-view-title-bar-service-override 7.1.0 → 7.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-title-bar-service-override",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.1.1"
   }
 }

package/vscode/src/vs/workbench/browser/parts/titlebar/commandCenterControl.js

@@ -7,7 +7,7 @@ import { SubmenuAction } from 'vscode/vscode/vs/base/common/actions';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { createActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuWorkbenchToolBar, HiddenItemStrategy, WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId, SubmenuItemAction, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -18,7 +18,6 @@ import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var CommandCenterCenterViewItem_1;
-const _moduleId = "vs/workbench/browser/parts/titlebar/commandCenterControl";
 let CommandCenterControl = class CommandCenterControl {
     constructor(windowTitle, hoverDelegate, instantiationService, quickInputService) {
         this._disposables = ( (new DisposableStore()));
@@ -144,13 +143,13 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
                                 label = that._windowTitle.fileName ?? label;
                             }
                             if (!label) {
-                                label = ( localizeWithPath(_moduleId, 0, "Search"));
+                                label = ( localize(6951, "Search"));
                             }
                             if (prefix) {
-                                label = ( localizeWithPath(_moduleId, 1, "{0} {1}", prefix, label));
+                                label = ( localize(6952, "{0} {1}", prefix, label));
                             }
                             if (suffix) {
-                                label = ( localizeWithPath(_moduleId, 2, "{0} {1}", label, suffix));
+                                label = ( localize(6953, "{0} {1}", label, suffix));
                             }
                             return label.replaceAll(/\r\n|\r|\n/g, '\u23CE');
                         }
@@ -171,17 +170,15 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
     getTooltip() {
         const kb = this._keybindingService.lookupKeybinding(this.action.id)?.getLabel();
         const title = kb
-            ? ( localizeWithPath(
-            _moduleId,
-            3,
+            ? ( localize(
+            6954,
             "Search {0} ({1}) \u2014 {2}",
             this._windowTitle.workspaceName,
             kb,
             this._windowTitle.value
         ))
-            : ( localizeWithPath(
-            _moduleId,
-            4,
+            : ( localize(
+            6955,
             "Search {0} \u2014 {1}",
             this._windowTitle.workspaceName,
             this._windowTitle.value
@@ -197,7 +194,7 @@ CommandCenterCenterViewItem = CommandCenterCenterViewItem_1 = ( (__decorate([
 ], CommandCenterCenterViewItem)));
 MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
     submenu: MenuId.CommandCenterCenter,
-    title: ( localizeWithPath(_moduleId, 5, "Command Center")),
+    title: ( localize(6956, "Command Center")),
     icon: Codicon.shield,
     order: 101,
 });

package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarActions.js

@@ -1,4 +1,4 @@
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
@@ -10,7 +10,6 @@ import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from 'vscode/vscode/vs/workb
 import { IsAuxiliaryWindowFocusedContext, TitleBarStyleContext, IsMainWindowFullscreenContext, TitleBarVisibleContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { TitleBarSetting, TitlebarStyle, CustomTitleBarVisibility } from 'vscode/vscode/vs/platform/window/common/window';
 
-const _moduleId = "vs/workbench/browser/parts/titlebar/titlebarActions";
 class ToggleConfigAction extends Action2 {
     constructor(section, title, description, order, mainWindowOnly) {
         const when = mainWindowOnly ? ( (IsAuxiliaryWindowFocusedContext.toNegated())) : ContextKeyExpr.true();
@@ -44,19 +43,19 @@ class ToggleConfigAction extends Action2 {
 }
 registerAction2(class ToggleCommandCenter extends ToggleConfigAction {
     constructor() {
-        super(LayoutSettings.COMMAND_CENTER, ( localizeWithPath(_moduleId, 0, 'Command Center')), ( localizeWithPath(_moduleId, 1, "Toggle visibility of the Command Center in title bar")), 1, false);
+        super(LayoutSettings.COMMAND_CENTER, ( localize(6989, 'Command Center')), ( localize(6990, "Toggle visibility of the Command Center in title bar")), 1, false);
     }
 });
 registerAction2(class ToggleLayoutControl extends ToggleConfigAction {
     constructor() {
-        super('workbench.layoutControl.enabled', ( localizeWithPath(_moduleId, 2, 'Layout Controls')), ( localizeWithPath(_moduleId, 3, "Toggle visibility of the Layout Controls in title bar")), 2, true);
+        super('workbench.layoutControl.enabled', ( localize(6991, 'Layout Controls')), ( localize(6992, "Toggle visibility of the Layout Controls in title bar")), 2, true);
     }
 });
 registerAction2(class ToggleCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `toggle.${TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY}`,
-            title: ( localizeWithPath(_moduleId, 4, 'Hide Custom Title Bar')),
+            title: ( localize(6993, 'Hide Custom Title Bar')),
             menu: [
                 { id: MenuId.TitleBarContext, order: 0, when: ( (ContextKeyExpr.equals(TitleBarStyleContext.key, TitlebarStyle.NATIVE))), group: '3_toggle' },
                 { id: MenuId.TitleBarTitleContext, order: 0, when: ( (ContextKeyExpr.equals(TitleBarStyleContext.key, TitlebarStyle.NATIVE))), group: '3_toggle' },
@@ -72,7 +71,7 @@ registerAction2(class ToggleCustomTitleBarWindowed extends Action2 {
     constructor() {
         super({
             id: `toggle.${TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY}.windowed`,
-            title: ( localizeWithPath(_moduleId, 5, 'Hide Custom Title Bar In Full Screen')),
+            title: ( localize(6994, 'Hide Custom Title Bar In Full Screen')),
             menu: [
                 { id: MenuId.TitleBarContext, order: 1, when: IsMainWindowFullscreenContext, group: '3_toggle' },
                 { id: MenuId.TitleBarTitleContext, order: 1, when: IsMainWindowFullscreenContext, group: '3_toggle' },
@@ -88,7 +87,7 @@ class ToggleCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `toggle.toggleCustomTitleBar`,
-            title: ( localizeWithPath(_moduleId, 6, 'Custom Title Bar')),
+            title: ( localize(6995, 'Custom Title Bar')),
             toggled: TitleBarVisibleContext,
             menu: [
                 {
@@ -139,7 +138,7 @@ registerAction2(class ShowCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `showCustomTitleBar`,
-            title: ( localize2WithPath(_moduleId, 7, "Show Custom Title Bar")),
+            title: ( localize2(6996, "Show Custom Title Bar")),
             precondition: ( (TitleBarVisibleContext.negate())),
             f1: true
         });
@@ -153,7 +152,7 @@ registerAction2(class HideCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `hideCustomTitleBar`,
-            title: ( localize2WithPath(_moduleId, 8, "Hide Custom Title Bar")),
+            title: ( localize2(6997, "Hide Custom Title Bar")),
             precondition: TitleBarVisibleContext,
             f1: true
         });
@@ -167,7 +166,7 @@ registerAction2(class HideCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `hideCustomTitleBarInFullScreen`,
-            title: ( localize2WithPath(_moduleId, 9, "Hide Custom Title Bar In Full Screen")),
+            title: ( localize2(6998, "Hide Custom Title Bar In Full Screen")),
             precondition: ( (ContextKeyExpr.and(TitleBarVisibleContext, IsMainWindowFullscreenContext))),
             f1: true
         });
@@ -186,7 +185,7 @@ registerAction2(class ToggleEditorActions extends Action2 {
         )))?.negate();
         super({
             id: `toggle.${ToggleEditorActions.settingsID}`,
-            title: ( localizeWithPath(_moduleId, 10, 'Editor Actions')),
+            title: ( localize(6999, 'Editor Actions')),
             toggled: ( (( (ContextKeyExpr.equals(`config.${ToggleEditorActions.settingsID}`, 'hidden'))).negate())),
             menu: [
                 { id: MenuId.TitleBarContext, order: 3, when: titleBarContextCondition, group: '2_config' },
@@ -217,16 +216,16 @@ registerAction2(class ToggleEditorActions extends Action2 {
 });
 const ACCOUNTS_ACTIVITY_TILE_ACTION = {
     id: ACCOUNTS_ACTIVITY_ID,
-    label: ( localizeWithPath(_moduleId, 11, "Accounts")),
-    tooltip: ( localizeWithPath(_moduleId, 11, "Accounts")),
+    label: ( localize(7000, "Accounts")),
+    tooltip: ( localize(7000, "Accounts")),
     class: undefined,
     enabled: true,
     run: function () { }
 };
 const GLOBAL_ACTIVITY_TITLE_ACTION = {
     id: GLOBAL_ACTIVITY_ID,
-    label: ( localizeWithPath(_moduleId, 12, "Manage")),
-    tooltip: ( localizeWithPath(_moduleId, 12, "Manage")),
+    label: ( localize(7001, "Manage")),
+    tooltip: ( localize(7001, "Manage")),
     class: undefined,
     enabled: true,
     run: function () { }

package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/titlebarpart.css.js';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { MultiWindowParts, Part } from 'vscode/vscode/vs/workbench/browser/part';
-import { isWCOEnabled, getZoomFactor } from 'vscode/vscode/vs/base/browser/browser';
+import { isWCOEnabled, getWCOBoundingRect, getZoomFactor } from 'vscode/vscode/vs/base/browser/browser';
 import { DEFAULT_CUSTOM_TITLEBAR_HEIGHT, getTitleBarStyle, hasNativeTitlebar, getMenuBarVisibility } from 'vscode/vscode/vs/platform/window/common/window';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
@@ -50,7 +50,6 @@ import { ACCOUNTS_ACTIVITY_TILE_ACTION, GLOBAL_ACTIVITY_TITLE_ACTION } from './t
 import { createInstantHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
 var AuxiliaryBrowserTitlebarPart_1;
-const _moduleId = "vs/workbench/browser/parts/titlebar/titlebarPart";
 let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
     constructor(instantiationService, storageService, themeService) {
         super('workbench.titleService', themeService, storageService);
@@ -71,7 +70,7 @@ let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
             constructor() {
                 super({
                     id: `workbench.action.focusTitleBar`,
-                    title: ( localize2WithPath(_moduleId, 0, 'Focus Title Bar')),
+                    title: ( localize2(3046, 'Focus Title Bar')),
                     category: Categories.View,
                     f1: true,
                 });
@@ -124,7 +123,11 @@ BrowserTitleService = ( (__decorate([
 ], BrowserTitleService)));
 let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
     get minimumHeight() {
-        const value = this.isCommandCenterVisible || (isWeb && isWCOEnabled()) ? DEFAULT_CUSTOM_TITLEBAR_HEIGHT : 30;
+        const wcoEnabled = isWeb && isWCOEnabled();
+        let value = this.isCommandCenterVisible || wcoEnabled ? DEFAULT_CUSTOM_TITLEBAR_HEIGHT : 30;
+        if (wcoEnabled) {
+            value = Math.max(value, getWCOBoundingRect()?.height ?? 0);
+        }
         return value / (this.preventZoom ? getZoomFactor(getWindow(this.element)) : 1);
     }
     get maximumHeight() { return this.minimumHeight; }
@@ -350,7 +353,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         this.actionToolBar = this.actionToolBarDisposable.add(this.instantiationService.createInstance(WorkbenchToolBar, this.actionToolBarElement, {
             contextMenu: MenuId.TitleBarContext,
             orientation: ActionsOrientation.HORIZONTAL,
-            ariaLabel: ( localizeWithPath(_moduleId, 1, "Title actions")),
+            ariaLabel: ( localize(3047, "Title actions")),
             getKeyBinding: action => this.getKeybinding(action),
             overflowBehavior: { maxItems: 9, exempted: [ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID, ...EDITOR_CORE_NAVIGATION_COMMANDS] },
             anchorAlignmentProvider: () => AnchorAlignment.RIGHT,