@codingame/monaco-vscode-view-title-bar-service-override 4.5.2 → 5.0.0

package/package.json

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

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

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { isActiveDocument, reset } from 'vscode/vscode/vs/base/browser/dom';
 import { BaseActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { renderIcon } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { SubmenuAction } from 'vscode/vscode/vs/base/common/actions';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
@@ -16,6 +15,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var CommandCenterCenterViewItem_1;
 const _moduleId = "vs/workbench/browser/parts/titlebar/commandCenterControl";
@@ -61,10 +61,11 @@ CommandCenterControl = ( (__decorate([
 let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends BaseActionViewItem {
     static { CommandCenterCenterViewItem_1 = this; }
     static { this._quickOpenCommandId = 'workbench.action.quickOpenWithModes'; }
-    constructor(_submenu, _windowTitle, options, _keybindingService, _instaService, _editorGroupService) {
+    constructor(_submenu, _windowTitle, options, _hoverService, _keybindingService, _instaService, _editorGroupService) {
         super(undefined, _submenu.actions.find(action => action.id === 'workbench.action.quickOpenWithModes') ?? _submenu.actions[0], options);
         this._submenu = _submenu;
         this._windowTitle = _windowTitle;
+        this._hoverService = _hoverService;
         this._keybindingService = _keybindingService;
         this._instaService = _instaService;
         this._editorGroupService = _editorGroupService;
@@ -74,7 +75,7 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
         super.render(container);
         container.classList.add('command-center-center');
         container.classList.toggle('multiple', (this._submenu.actions.length > 1));
-        const hover = this._store.add(setupCustomHover(this._hoverDelegate, container, this.getTooltip()));
+        const hover = this._store.add(this._hoverService.setupUpdatableHover(this._hoverDelegate, container, this.getTooltip()));
         this._store.add(this._windowTitle.onDidChange(() => {
             hover.update(this.getTooltip());
         }));
@@ -118,7 +119,7 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
                             labelElement.classList.add('search-label');
                             labelElement.innerText = label;
                             reset(container, searchIcon, labelElement);
-                            const hover = this._store.add(setupCustomHover(that._hoverDelegate, container, this.getTooltip()));
+                            const hover = this._store.add(that._hoverService.setupUpdatableHover(that._hoverDelegate, container, this.getTooltip()));
                             this._store.add(that._windowTitle.onDidChange(() => {
                                 hover.update(this.getTooltip());
                                 labelElement.innerText = this._getLabel();
@@ -189,9 +190,10 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
     }
 };
 CommandCenterCenterViewItem = CommandCenterCenterViewItem_1 = ( (__decorate([
-    ( (__param(3, IKeybindingService))),
-    ( (__param(4, IInstantiationService))),
-    ( (__param(5, IEditorGroupsService)))
+    ( (__param(3, IHoverService))),
+    ( (__param(4, IKeybindingService))),
+    ( (__param(5, IInstantiationService))),
+    ( (__param(6, IEditorGroupsService)))
 ], CommandCenterCenterViewItem)));
 MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
     submenu: MenuId.CommandCenterCenter,

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

@@ -9,11 +9,12 @@ import { IsAuxiliaryWindowFocusedContext, TitleBarStyleContext, IsMainWindowFull
 
 const _moduleId = "vs/workbench/browser/parts/titlebar/titlebarActions";
 class ToggleConfigAction extends Action2 {
-    constructor(section, title, order, mainWindowOnly) {
+    constructor(section, title, description, order, mainWindowOnly) {
         const when = mainWindowOnly ? ( (IsAuxiliaryWindowFocusedContext.toNegated())) : ContextKeyExpr.true();
         super({
             id: `toggle.${section}`,
             title,
+            metadata: description ? { description } : undefined,
             toggled: ( (ContextKeyExpr.equals(`config.${section}`, true))),
             menu: [
                 {
@@ -40,19 +41,19 @@ class ToggleConfigAction extends Action2 {
 }
 registerAction2(class ToggleCommandCenter extends ToggleConfigAction {
     constructor() {
-        super("window.commandCenter" , ( localizeWithPath(_moduleId, 0, 'Command Center')), 1, false);
+        super("window.commandCenter" , ( localizeWithPath(_moduleId, 0, 'Command Center')), ( localizeWithPath(_moduleId, 1, "Toggle visibility of the Command Center in title bar")), 1, false);
     }
 });
 registerAction2(class ToggleLayoutControl extends ToggleConfigAction {
     constructor() {
-        super('workbench.layoutControl.enabled', ( localizeWithPath(_moduleId, 1, 'Layout Controls')), 2, true);
+        super('workbench.layoutControl.enabled', ( localizeWithPath(_moduleId, 2, 'Layout Controls')), ( localizeWithPath(_moduleId, 3, "Toggle visibility of the Layout Controls in title bar")), 2, true);
     }
 });
 registerAction2(class ToggleCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `toggle.${"window.customTitleBarVisibility" }`,
-            title: ( localizeWithPath(_moduleId, 2, 'Hide Custom Title Bar')),
+            title: ( localizeWithPath(_moduleId, 4, 'Hide Custom Title Bar')),
             menu: [
                 { id: MenuId.TitleBarContext, order: 0, when: ( (ContextKeyExpr.equals(TitleBarStyleContext.key, "native" ))), group: '3_toggle' },
                 { id: MenuId.TitleBarTitleContext, order: 0, when: ( (ContextKeyExpr.equals(TitleBarStyleContext.key, "native" ))), group: '3_toggle' },
@@ -68,7 +69,7 @@ registerAction2(class ToggleCustomTitleBarWindowed extends Action2 {
     constructor() {
         super({
             id: `toggle.${"window.customTitleBarVisibility" }.windowed`,
-            title: ( localizeWithPath(_moduleId, 3, 'Hide Custom Title Bar In Full Screen')),
+            title: ( localizeWithPath(_moduleId, 5, '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' },
@@ -84,7 +85,7 @@ class ToggleCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `toggle.toggleCustomTitleBar`,
-            title: ( localizeWithPath(_moduleId, 4, 'Custom Title Bar')),
+            title: ( localizeWithPath(_moduleId, 6, 'Custom Title Bar')),
             toggled: TitleBarVisibleContext,
             menu: [
                 {
@@ -135,7 +136,7 @@ registerAction2(class ShowCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `showCustomTitleBar`,
-            title: ( localize2WithPath(_moduleId, 5, "Show Custom Title Bar")),
+            title: ( localize2WithPath(_moduleId, 7, "Show Custom Title Bar")),
             precondition: ( (TitleBarVisibleContext.negate())),
             f1: true
         });
@@ -149,7 +150,7 @@ registerAction2(class HideCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `hideCustomTitleBar`,
-            title: ( localize2WithPath(_moduleId, 6, "Hide Custom Title Bar")),
+            title: ( localize2WithPath(_moduleId, 8, "Hide Custom Title Bar")),
             precondition: TitleBarVisibleContext,
             f1: true
         });
@@ -163,7 +164,7 @@ registerAction2(class HideCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `hideCustomTitleBarInFullScreen`,
-            title: ( localize2WithPath(_moduleId, 7, "Hide Custom Title Bar In Full Screen")),
+            title: ( localize2WithPath(_moduleId, 9, "Hide Custom Title Bar In Full Screen")),
             precondition: ( (ContextKeyExpr.and(TitleBarVisibleContext, IsMainWindowFullscreenContext))),
             f1: true
         });
@@ -182,7 +183,7 @@ registerAction2(class ToggleEditorActions extends Action2 {
         )))?.negate();
         super({
             id: `toggle.${ToggleEditorActions.settingsID}`,
-            title: ( localizeWithPath(_moduleId, 8, 'Editor Actions')),
+            title: ( localizeWithPath(_moduleId, 10, 'Editor Actions')),
             toggled: ( (( (ContextKeyExpr.equals(`config.${ToggleEditorActions.settingsID}`, 'hidden'))).negate())),
             menu: [
                 { id: MenuId.TitleBarContext, order: 3, when: titleBarContextCondition, group: '2_config' },
@@ -213,16 +214,16 @@ registerAction2(class ToggleEditorActions extends Action2 {
 });
 const ACCOUNTS_ACTIVITY_TILE_ACTION = {
     id: ACCOUNTS_ACTIVITY_ID,
-    label: ( localizeWithPath(_moduleId, 9, "Accounts")),
-    tooltip: ( localizeWithPath(_moduleId, 9, "Accounts")),
+    label: ( localizeWithPath(_moduleId, 11, "Accounts")),
+    tooltip: ( localizeWithPath(_moduleId, 11, "Accounts")),
     class: undefined,
     enabled: true,
     run: function () { }
 };
 const GLOBAL_ACTIVITY_TITLE_ACTION = {
     id: GLOBAL_ACTIVITY_ID,
-    label: ( localizeWithPath(_moduleId, 10, "Manage")),
-    tooltip: ( localizeWithPath(_moduleId, 10, "Manage")),
+    label: ( localizeWithPath(_moduleId, 12, "Manage")),
+    tooltip: ( localizeWithPath(_moduleId, 12, "Manage")),
     class: undefined,
     enabled: true,
     run: function () { }

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

@@ -32,7 +32,7 @@ import { CommandCenterControl } from './commandCenterControl.js';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { GLOBAL_ACTIVITY_ID, ACCOUNTS_ACTIVITY_ID } from 'vscode/vscode/vs/workbench/common/activity';
-import { SimpleGlobalActivityActionViewItem, SimpleAccountActivityActionViewItem } from 'vscode/vscode/vs/workbench/browser/parts/globalCompositeBar';
+import { SimpleGlobalActivityActionViewItem, SimpleAccountActivityActionViewItem, isAccountsActionVisible, AccountsActivityActionViewItem } from 'vscode/vscode/vs/workbench/browser/parts/globalCompositeBar';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { ActionRunner } from 'vscode/vscode/vs/base/common/actions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -130,6 +130,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         this.configurationService = configurationService;
         this.environmentService = environmentService;
         this.instantiationService = instantiationService;
+        this.storageService = storageService;
         this.contextKeyService = contextKeyService;
         this.hostService = hostService;
         this.editorGroupService = editorGroupService;
@@ -145,6 +146,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         this.editorActionsChangeDisposable = this._register(( (new DisposableStore())));
         this.editorToolbarMenuDisposables = this._register(( (new DisposableStore())));
         this.layoutToolbarMenuDisposables = this._register(( (new DisposableStore())));
+        this.activityToolbarDisposables = this._register(( (new DisposableStore())));
         this.titleDisposables = this._register(( (new DisposableStore())));
         this.titleBarStyle = getTitleBarStyle(this.configurationService);
         this.isInactive = false;
@@ -378,7 +380,9 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
                 );
             }
             if (this.activityActionsEnabled) {
-                actions.primary.push(ACCOUNTS_ACTIVITY_TILE_ACTION);
+                if (isAccountsActionVisible(this.storageService)) {
+                    actions.primary.push(ACCOUNTS_ACTIVITY_TILE_ACTION);
+                }
                 actions.primary.push(GLOBAL_ACTIVITY_TITLE_ACTION);
             }
             this.actionToolBar.setActions(prepareActions(actions.primary), prepareActions(actions.secondary));
@@ -408,6 +412,12 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
                 this.layoutToolbarMenu = undefined;
             }
         }
+        if (update.activityActions) {
+            this.activityToolbarDisposables.clear();
+            if (this.activityActionsEnabled) {
+                this.activityToolbarDisposables.add(this.storageService.onDidChangeValue(0 , AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, this._store)(() => updateToolBarActions()));
+            }
+        }
         updateToolBarActions();
     }
     updateStyles() {