@codingame/monaco-vscode-view-title-bar-service-override 3.2.3 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-title-bar-service-override",
-  "version": "3.2.3",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

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

@@ -1,7 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { reset, isActiveDocument } from 'vscode/vscode/vs/base/browser/dom';
 import { BaseActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabelHover';
+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';
@@ -31,12 +32,12 @@ let CommandCenterControl = class CommandCenterControl {
                 primaryGroup: () => true,
             },
             telemetrySource: 'commandCenter',
-            actionViewItemProvider: (action) => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof SubmenuItemAction && action.item.submenu === MenuId.CommandCenterCenter) {
-                    return instantiationService.createInstance(CommandCenterCenterViewItem, action, windowTitle, hoverDelegate, {});
+                    return instantiationService.createInstance(CommandCenterCenterViewItem, action, windowTitle, { ...options, hoverDelegate });
                 }
                 else {
-                    return createActionViewItem(instantiationService, action, { hoverDelegate });
+                    return createActionViewItem(instantiationService, action, { ...options, hoverDelegate });
                 }
             }
         });
@@ -59,14 +60,14 @@ CommandCenterControl = ( __decorate([
 let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends BaseActionViewItem {
     static { CommandCenterCenterViewItem_1 = this; }
     static { this._quickOpenCommandId = 'workbench.action.quickOpenWithModes'; }
-    constructor(_submenu, _windowTitle, _hoverDelegate, options, _keybindingService, _instaService, _editorGroupService) {
+    constructor(_submenu, _windowTitle, options, _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._hoverDelegate = _hoverDelegate;
         this._keybindingService = _keybindingService;
         this._instaService = _instaService;
         this._editorGroupService = _editorGroupService;
+        this._hoverDelegate = options.hoverDelegate ?? getDefaultHoverDelegate('mouse');
     }
     render(container) {
         super.render(container);
@@ -203,9 +204,9 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
     }
 };
 CommandCenterCenterViewItem = CommandCenterCenterViewItem_1 = ( __decorate([
-    ( __param(4, IKeybindingService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IEditorGroupsService))
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IEditorGroupsService))
 ], CommandCenterCenterViewItem));
 MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
     submenu: MenuId.CommandCenterCenter,

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

@@ -108,7 +108,7 @@ class ToggleCustomTitleBar extends Action2 {
                 {
                     id: MenuId.MenubarAppearanceMenu,
                     order: 6,
-                    when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals(TitleBarStyleContext.key, "native" )), ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.layoutControl.enabled', false)), ( ContextKeyExpr.equals('config.window.commandCenter', false)), ( ContextKeyExpr.notEquals('config.workbench.editor.editorActionsLocation', 'titleBar')), ( ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'top'))))?.negate())), IsMainWindowFullscreenContext)),
+                    when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals(TitleBarStyleContext.key, "native" )), ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.layoutControl.enabled', false)), ( ContextKeyExpr.equals('config.window.commandCenter', false)), ( ContextKeyExpr.notEquals('config.workbench.editor.editorActionsLocation', 'titleBar')), ( ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'top')), ( ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'bottom'))))?.negate())), IsMainWindowFullscreenContext)),
                     group: '2_workbench_layout'
                 },
             ],

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

@@ -42,7 +42,7 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { EditorCommandsContextActionRunner } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorTabsControl';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { ACCOUNTS_ACTIVITY_TILE_ACTION, GLOBAL_ACTIVITY_TITLE_ACTION } from './titlebarActions.js';
-import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegate';
+import { createInstantHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
 var AuxiliaryBrowserTitlebarPart_1;
 let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
@@ -61,7 +61,7 @@ let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
     }
     registerActions() {
         const that = this;
-        registerAction2(class FocusTitleBar extends Action2 {
+        this._register(registerAction2(class FocusTitleBar extends Action2 {
             constructor() {
                 super({
                     id: `workbench.action.focusTitleBar`,
@@ -77,7 +77,7 @@ let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
             run() {
                 that.getPartByDocument(getActiveDocument()).focus();
             }
-        });
+        }));
     }
     createAuxiliaryTitlebarPart(container, editorGroupsContainer) {
         const titlebarPartContainer = document.createElement('div');
@@ -154,7 +154,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         this.editorService = editorService.createScoped(editorGroupsContainer, this._store);
         this.editorGroupsContainer = editorGroupsContainer === 'main' ? editorGroupService.mainPart : editorGroupsContainer;
         this.windowTitle = this._register(instantiationService.createInstance(WindowTitle, targetWindow, editorGroupsContainer));
-        this.hoverDelegate = this._register(getDefaultHoverDelegate('element', true));
+        this.hoverDelegate = this._register(createInstantHoverDelegate());
         this.registerListeners(getWindowId(targetWindow));
     }
     registerListeners(targetWindowId) {
@@ -330,12 +330,12 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         }
         const activeEditorPane = this.editorGroupsContainer.activeGroup?.activeEditorPane;
         if (activeEditorPane && activeEditorPane instanceof EditorPane) {
-            const result = activeEditorPane.getActionViewItem(action, { hoverDelegate: this.hoverDelegate });
+            const result = activeEditorPane.getActionViewItem(action, options);
             if (result) {
                 return result;
             }
         }
-        return createActionViewItem(this.instantiationService, action, { ...options, hoverDelegate: this.hoverDelegate, menuAsChild: false });
+        return createActionViewItem(this.instantiationService, action, { ...options, menuAsChild: false });
     }
     getKeybinding(action) {
         const editorPaneAwareContextKeyService = this.editorGroupsContainer.activeGroup?.activeEditorPane?.scopedContextKeyService ?? this.contextKeyService;
@@ -356,7 +356,8 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
             anchorAlignmentProvider: () => 1 ,
             telemetrySource: 'titlePart',
             highlightToggledItems: this.editorActionsEnabled,
-            actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options)
+            actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
+            hoverDelegate: this.hoverDelegate
         }));
         if (this.editorActionsEnabled) {
             this.actionToolBarDisposable.add(this.editorGroupsContainer.onDidChangeActiveGroup(() => this.createActionToolBarMenus({ editorActions: true })));
@@ -469,7 +470,8 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
             ((this.editorGroupService.partOptions.editorActionsLocation === "default"  && this.editorGroupService.partOptions.showTabs === "none") );
     }
     get activityActionsEnabled() {
-        return !this.isAuxiliary && this.configurationService.getValue("workbench.activityBar.location" ) === "top" ;
+        const activityBarPosition = this.configurationService.getValue("workbench.activityBar.location" );
+        return !this.isAuxiliary && ((activityBarPosition === "top"  || activityBarPosition === "bottom") );
     }
     get hasZoomableElements() {
         const hasMenubar = !(this.currentMenubarVisibility === 'hidden' || this.currentMenubarVisibility === 'compact' || (!isWeb && isMacintosh));