@codingame/monaco-vscode-view-title-bar-service-override 4.5.1 → 5.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-view-title-bar-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "5.0.0",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -26,6 +26,6 @@
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@5.0.0"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
|
2
2
|
import { isActiveDocument, reset } from 'vscode/vscode/vs/base/browser/dom';
|
|
3
3
|
import { BaseActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
|
|
4
4
|
import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
|
|
5
|
-
import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
|
|
6
5
|
import { renderIcon } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
|
|
7
6
|
import { SubmenuAction } from 'vscode/vscode/vs/base/common/actions';
|
|
8
7
|
import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
|
|
@@ -16,12 +15,14 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
|
|
|
16
15
|
import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
|
|
17
16
|
import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
|
|
18
17
|
import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
|
|
18
|
+
import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
|
|
19
19
|
|
|
20
20
|
var CommandCenterCenterViewItem_1;
|
|
21
|
+
const _moduleId = "vs/workbench/browser/parts/titlebar/commandCenterControl";
|
|
21
22
|
let CommandCenterControl = class CommandCenterControl {
|
|
22
23
|
constructor(windowTitle, hoverDelegate, instantiationService, quickInputService) {
|
|
23
|
-
this._disposables = ( new DisposableStore());
|
|
24
|
-
this._onDidChangeVisibility = ( new Emitter());
|
|
24
|
+
this._disposables = ( (new DisposableStore()));
|
|
25
|
+
this._onDidChangeVisibility = ( (new Emitter()));
|
|
25
26
|
this.onDidChangeVisibility = this._onDidChangeVisibility.event;
|
|
26
27
|
this.element = document.createElement('div');
|
|
27
28
|
this.element.classList.add('command-center');
|
|
@@ -53,17 +54,18 @@ let CommandCenterControl = class CommandCenterControl {
|
|
|
53
54
|
this._disposables.dispose();
|
|
54
55
|
}
|
|
55
56
|
};
|
|
56
|
-
CommandCenterControl = ( __decorate([
|
|
57
|
-
( __param(2, IInstantiationService)),
|
|
58
|
-
( __param(3, IQuickInputService))
|
|
59
|
-
], CommandCenterControl));
|
|
57
|
+
CommandCenterControl = ( (__decorate([
|
|
58
|
+
( (__param(2, IInstantiationService))),
|
|
59
|
+
( (__param(3, IQuickInputService)))
|
|
60
|
+
], CommandCenterControl)));
|
|
60
61
|
let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends BaseActionViewItem {
|
|
61
62
|
static { CommandCenterCenterViewItem_1 = this; }
|
|
62
63
|
static { this._quickOpenCommandId = 'workbench.action.quickOpenWithModes'; }
|
|
63
|
-
constructor(_submenu, _windowTitle, options, _keybindingService, _instaService, _editorGroupService) {
|
|
64
|
+
constructor(_submenu, _windowTitle, options, _hoverService, _keybindingService, _instaService, _editorGroupService) {
|
|
64
65
|
super(undefined, _submenu.actions.find(action => action.id === 'workbench.action.quickOpenWithModes') ?? _submenu.actions[0], options);
|
|
65
66
|
this._submenu = _submenu;
|
|
66
67
|
this._windowTitle = _windowTitle;
|
|
68
|
+
this._hoverService = _hoverService;
|
|
67
69
|
this._keybindingService = _keybindingService;
|
|
68
70
|
this._instaService = _instaService;
|
|
69
71
|
this._editorGroupService = _editorGroupService;
|
|
@@ -73,7 +75,7 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
|
|
|
73
75
|
super.render(container);
|
|
74
76
|
container.classList.add('command-center-center');
|
|
75
77
|
container.classList.toggle('multiple', (this._submenu.actions.length > 1));
|
|
76
|
-
const hover = this._store.add(
|
|
78
|
+
const hover = this._store.add(this._hoverService.setupUpdatableHover(this._hoverDelegate, container, this.getTooltip()));
|
|
77
79
|
this._store.add(this._windowTitle.onDidChange(() => {
|
|
78
80
|
hover.update(this.getTooltip());
|
|
79
81
|
}));
|
|
@@ -117,7 +119,7 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
|
|
|
117
119
|
labelElement.classList.add('search-label');
|
|
118
120
|
labelElement.innerText = label;
|
|
119
121
|
reset(container, searchIcon, labelElement);
|
|
120
|
-
const hover = this._store.add(
|
|
122
|
+
const hover = this._store.add(that._hoverService.setupUpdatableHover(that._hoverDelegate, container, this.getTooltip()));
|
|
121
123
|
this._store.add(that._windowTitle.onDidChange(() => {
|
|
122
124
|
hover.update(this.getTooltip());
|
|
123
125
|
labelElement.innerText = this._getLabel();
|
|
@@ -142,29 +144,13 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
|
|
|
142
144
|
label = that._windowTitle.fileName ?? label;
|
|
143
145
|
}
|
|
144
146
|
if (!label) {
|
|
145
|
-
label = ( localizeWithPath(
|
|
146
|
-
'vs/workbench/browser/parts/titlebar/commandCenterControl',
|
|
147
|
-
'label.dfl',
|
|
148
|
-
"Search"
|
|
149
|
-
));
|
|
147
|
+
label = ( localizeWithPath(_moduleId, 0, "Search"));
|
|
150
148
|
}
|
|
151
149
|
if (prefix) {
|
|
152
|
-
label = ( localizeWithPath(
|
|
153
|
-
'vs/workbench/browser/parts/titlebar/commandCenterControl',
|
|
154
|
-
'label1',
|
|
155
|
-
"{0} {1}",
|
|
156
|
-
prefix,
|
|
157
|
-
label
|
|
158
|
-
));
|
|
150
|
+
label = ( localizeWithPath(_moduleId, 1, "{0} {1}", prefix, label));
|
|
159
151
|
}
|
|
160
152
|
if (suffix) {
|
|
161
|
-
label = ( localizeWithPath(
|
|
162
|
-
'vs/workbench/browser/parts/titlebar/commandCenterControl',
|
|
163
|
-
'label2',
|
|
164
|
-
"{0} {1}",
|
|
165
|
-
label,
|
|
166
|
-
suffix
|
|
167
|
-
));
|
|
153
|
+
label = ( localizeWithPath(_moduleId, 2, "{0} {1}", label, suffix));
|
|
168
154
|
}
|
|
169
155
|
return label.replaceAll(/\r\n|\r|\n/g, '\u23CE');
|
|
170
156
|
}
|
|
@@ -186,16 +172,16 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
|
|
|
186
172
|
const kb = this._keybindingService.lookupKeybinding(this.action.id)?.getLabel();
|
|
187
173
|
const title = kb
|
|
188
174
|
? ( localizeWithPath(
|
|
189
|
-
|
|
190
|
-
|
|
175
|
+
_moduleId,
|
|
176
|
+
3,
|
|
191
177
|
"Search {0} ({1}) \u2014 {2}",
|
|
192
178
|
this._windowTitle.workspaceName,
|
|
193
179
|
kb,
|
|
194
180
|
this._windowTitle.value
|
|
195
181
|
))
|
|
196
182
|
: ( localizeWithPath(
|
|
197
|
-
|
|
198
|
-
|
|
183
|
+
_moduleId,
|
|
184
|
+
4,
|
|
199
185
|
"Search {0} \u2014 {1}",
|
|
200
186
|
this._windowTitle.workspaceName,
|
|
201
187
|
this._windowTitle.value
|
|
@@ -203,18 +189,15 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
|
|
|
203
189
|
return title;
|
|
204
190
|
}
|
|
205
191
|
};
|
|
206
|
-
CommandCenterCenterViewItem = CommandCenterCenterViewItem_1 = ( __decorate([
|
|
207
|
-
( __param(3,
|
|
208
|
-
( __param(4,
|
|
209
|
-
( __param(5,
|
|
210
|
-
|
|
192
|
+
CommandCenterCenterViewItem = CommandCenterCenterViewItem_1 = ( (__decorate([
|
|
193
|
+
( (__param(3, IHoverService))),
|
|
194
|
+
( (__param(4, IKeybindingService))),
|
|
195
|
+
( (__param(5, IInstantiationService))),
|
|
196
|
+
( (__param(6, IEditorGroupsService)))
|
|
197
|
+
], CommandCenterCenterViewItem)));
|
|
211
198
|
MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
|
|
212
199
|
submenu: MenuId.CommandCenterCenter,
|
|
213
|
-
title: ( localizeWithPath(
|
|
214
|
-
'vs/workbench/browser/parts/titlebar/commandCenterControl',
|
|
215
|
-
'title3',
|
|
216
|
-
"Command Center"
|
|
217
|
-
)),
|
|
200
|
+
title: ( localizeWithPath(_moduleId, 5, "Command Center")),
|
|
218
201
|
icon: Codicon.shield,
|
|
219
202
|
order: 101,
|
|
220
203
|
});
|
|
@@ -7,13 +7,15 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
|
|
|
7
7
|
import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from 'vscode/vscode/vs/workbench/common/activity';
|
|
8
8
|
import { IsAuxiliaryWindowFocusedContext, TitleBarStyleContext, IsMainWindowFullscreenContext, TitleBarVisibleContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
|
|
9
9
|
|
|
10
|
+
const _moduleId = "vs/workbench/browser/parts/titlebar/titlebarActions";
|
|
10
11
|
class ToggleConfigAction extends Action2 {
|
|
11
|
-
constructor(section, title, order, mainWindowOnly) {
|
|
12
|
-
const when = mainWindowOnly ? ( IsAuxiliaryWindowFocusedContext.toNegated()) : ContextKeyExpr.true();
|
|
12
|
+
constructor(section, title, description, order, mainWindowOnly) {
|
|
13
|
+
const when = mainWindowOnly ? ( (IsAuxiliaryWindowFocusedContext.toNegated())) : ContextKeyExpr.true();
|
|
13
14
|
super({
|
|
14
15
|
id: `toggle.${section}`,
|
|
15
16
|
title,
|
|
16
|
-
|
|
17
|
+
metadata: description ? { description } : undefined,
|
|
18
|
+
toggled: ( (ContextKeyExpr.equals(`config.${section}`, true))),
|
|
17
19
|
menu: [
|
|
18
20
|
{
|
|
19
21
|
id: MenuId.TitleBarContext,
|
|
@@ -39,34 +41,22 @@ class ToggleConfigAction extends Action2 {
|
|
|
39
41
|
}
|
|
40
42
|
registerAction2(class ToggleCommandCenter extends ToggleConfigAction {
|
|
41
43
|
constructor() {
|
|
42
|
-
super("window.commandCenter" , ( localizeWithPath(
|
|
43
|
-
'vs/workbench/browser/parts/titlebar/titlebarActions',
|
|
44
|
-
'toggle.commandCenter',
|
|
45
|
-
'Command Center'
|
|
46
|
-
)), 1, false);
|
|
44
|
+
super("window.commandCenter" , ( localizeWithPath(_moduleId, 0, 'Command Center')), ( localizeWithPath(_moduleId, 1, "Toggle visibility of the Command Center in title bar")), 1, false);
|
|
47
45
|
}
|
|
48
46
|
});
|
|
49
47
|
registerAction2(class ToggleLayoutControl extends ToggleConfigAction {
|
|
50
48
|
constructor() {
|
|
51
|
-
super('workbench.layoutControl.enabled', ( localizeWithPath(
|
|
52
|
-
'vs/workbench/browser/parts/titlebar/titlebarActions',
|
|
53
|
-
'toggle.layout',
|
|
54
|
-
'Layout Controls'
|
|
55
|
-
)), 2, true);
|
|
49
|
+
super('workbench.layoutControl.enabled', ( localizeWithPath(_moduleId, 2, 'Layout Controls')), ( localizeWithPath(_moduleId, 3, "Toggle visibility of the Layout Controls in title bar")), 2, true);
|
|
56
50
|
}
|
|
57
51
|
});
|
|
58
52
|
registerAction2(class ToggleCustomTitleBar extends Action2 {
|
|
59
53
|
constructor() {
|
|
60
54
|
super({
|
|
61
55
|
id: `toggle.${"window.customTitleBarVisibility" }`,
|
|
62
|
-
title: ( localizeWithPath(
|
|
63
|
-
'vs/workbench/browser/parts/titlebar/titlebarActions',
|
|
64
|
-
'toggle.hideCustomTitleBar',
|
|
65
|
-
'Hide Custom Title Bar'
|
|
66
|
-
)),
|
|
56
|
+
title: ( localizeWithPath(_moduleId, 4, 'Hide Custom Title Bar')),
|
|
67
57
|
menu: [
|
|
68
|
-
{ id: MenuId.TitleBarContext, order: 0, when: ( ContextKeyExpr.equals(TitleBarStyleContext.key, "native" )), group: '3_toggle' },
|
|
69
|
-
{ id: MenuId.TitleBarTitleContext, order: 0, when: ( ContextKeyExpr.equals(TitleBarStyleContext.key, "native" )), group: '3_toggle' },
|
|
58
|
+
{ id: MenuId.TitleBarContext, order: 0, when: ( (ContextKeyExpr.equals(TitleBarStyleContext.key, "native" ))), group: '3_toggle' },
|
|
59
|
+
{ id: MenuId.TitleBarTitleContext, order: 0, when: ( (ContextKeyExpr.equals(TitleBarStyleContext.key, "native" ))), group: '3_toggle' },
|
|
70
60
|
]
|
|
71
61
|
});
|
|
72
62
|
}
|
|
@@ -79,11 +69,7 @@ registerAction2(class ToggleCustomTitleBarWindowed extends Action2 {
|
|
|
79
69
|
constructor() {
|
|
80
70
|
super({
|
|
81
71
|
id: `toggle.${"window.customTitleBarVisibility" }.windowed`,
|
|
82
|
-
title: ( localizeWithPath(
|
|
83
|
-
'vs/workbench/browser/parts/titlebar/titlebarActions',
|
|
84
|
-
'toggle.hideCustomTitleBarInFullScreen',
|
|
85
|
-
'Hide Custom Title Bar In Full Screen'
|
|
86
|
-
)),
|
|
72
|
+
title: ( localizeWithPath(_moduleId, 5, 'Hide Custom Title Bar In Full Screen')),
|
|
87
73
|
menu: [
|
|
88
74
|
{ id: MenuId.TitleBarContext, order: 1, when: IsMainWindowFullscreenContext, group: '3_toggle' },
|
|
89
75
|
{ id: MenuId.TitleBarTitleContext, order: 1, when: IsMainWindowFullscreenContext, group: '3_toggle' },
|
|
@@ -99,17 +85,22 @@ class ToggleCustomTitleBar extends Action2 {
|
|
|
99
85
|
constructor() {
|
|
100
86
|
super({
|
|
101
87
|
id: `toggle.toggleCustomTitleBar`,
|
|
102
|
-
title: ( localizeWithPath(
|
|
103
|
-
'vs/workbench/browser/parts/titlebar/titlebarActions',
|
|
104
|
-
'toggle.customTitleBar',
|
|
105
|
-
'Custom Title Bar'
|
|
106
|
-
)),
|
|
88
|
+
title: ( localizeWithPath(_moduleId, 6, 'Custom Title Bar')),
|
|
107
89
|
toggled: TitleBarVisibleContext,
|
|
108
90
|
menu: [
|
|
109
91
|
{
|
|
110
92
|
id: MenuId.MenubarAppearanceMenu,
|
|
111
93
|
order: 6,
|
|
112
|
-
when: ( ContextKeyExpr.or(
|
|
94
|
+
when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
|
|
95
|
+
(ContextKeyExpr.equals(TitleBarStyleContext.key, "native" )),
|
|
96
|
+
( (ContextKeyExpr.and(
|
|
97
|
+
(ContextKeyExpr.equals('config.workbench.layoutControl.enabled', false)),
|
|
98
|
+
(ContextKeyExpr.equals('config.window.commandCenter', false)),
|
|
99
|
+
(ContextKeyExpr.notEquals('config.workbench.editor.editorActionsLocation', 'titleBar')),
|
|
100
|
+
(ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'top')),
|
|
101
|
+
(ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'bottom'))
|
|
102
|
+
)))?.negate()
|
|
103
|
+
)), IsMainWindowFullscreenContext))),
|
|
113
104
|
group: '2_workbench_layout'
|
|
114
105
|
},
|
|
115
106
|
],
|
|
@@ -145,12 +136,8 @@ registerAction2(class ShowCustomTitleBar extends Action2 {
|
|
|
145
136
|
constructor() {
|
|
146
137
|
super({
|
|
147
138
|
id: `showCustomTitleBar`,
|
|
148
|
-
title: ( localize2WithPath(
|
|
149
|
-
|
|
150
|
-
'showCustomTitleBar',
|
|
151
|
-
"Show Custom Title Bar"
|
|
152
|
-
)),
|
|
153
|
-
precondition: ( TitleBarVisibleContext.negate()),
|
|
139
|
+
title: ( localize2WithPath(_moduleId, 7, "Show Custom Title Bar")),
|
|
140
|
+
precondition: ( (TitleBarVisibleContext.negate())),
|
|
154
141
|
f1: true
|
|
155
142
|
});
|
|
156
143
|
}
|
|
@@ -163,11 +150,7 @@ registerAction2(class HideCustomTitleBar extends Action2 {
|
|
|
163
150
|
constructor() {
|
|
164
151
|
super({
|
|
165
152
|
id: `hideCustomTitleBar`,
|
|
166
|
-
title: ( localize2WithPath(
|
|
167
|
-
'vs/workbench/browser/parts/titlebar/titlebarActions',
|
|
168
|
-
'hideCustomTitleBar',
|
|
169
|
-
"Hide Custom Title Bar"
|
|
170
|
-
)),
|
|
153
|
+
title: ( localize2WithPath(_moduleId, 8, "Hide Custom Title Bar")),
|
|
171
154
|
precondition: TitleBarVisibleContext,
|
|
172
155
|
f1: true
|
|
173
156
|
});
|
|
@@ -181,12 +164,8 @@ registerAction2(class HideCustomTitleBar extends Action2 {
|
|
|
181
164
|
constructor() {
|
|
182
165
|
super({
|
|
183
166
|
id: `hideCustomTitleBarInFullScreen`,
|
|
184
|
-
title: ( localize2WithPath(
|
|
185
|
-
|
|
186
|
-
'hideCustomTitleBarInFullScreen',
|
|
187
|
-
"Hide Custom Title Bar In Full Screen"
|
|
188
|
-
)),
|
|
189
|
-
precondition: ( ContextKeyExpr.and(TitleBarVisibleContext, IsMainWindowFullscreenContext)),
|
|
167
|
+
title: ( localize2WithPath(_moduleId, 9, "Hide Custom Title Bar In Full Screen")),
|
|
168
|
+
precondition: ( (ContextKeyExpr.and(TitleBarVisibleContext, IsMainWindowFullscreenContext))),
|
|
190
169
|
f1: true
|
|
191
170
|
});
|
|
192
171
|
}
|
|
@@ -198,15 +177,14 @@ registerAction2(class HideCustomTitleBar extends Action2 {
|
|
|
198
177
|
registerAction2(class ToggleEditorActions extends Action2 {
|
|
199
178
|
static { this.settingsID = `workbench.editor.editorActionsLocation`; }
|
|
200
179
|
constructor() {
|
|
201
|
-
const titleBarContextCondition = ( ContextKeyExpr.and(
|
|
180
|
+
const titleBarContextCondition = ( (ContextKeyExpr.and(
|
|
181
|
+
(( (ContextKeyExpr.equals(`config.workbench.editor.showTabs`, 'none'))).negate()),
|
|
182
|
+
(ContextKeyExpr.equals(`config.${ToggleEditorActions.settingsID}`, 'default'))
|
|
183
|
+
)))?.negate();
|
|
202
184
|
super({
|
|
203
185
|
id: `toggle.${ToggleEditorActions.settingsID}`,
|
|
204
|
-
title: ( localizeWithPath(
|
|
205
|
-
|
|
206
|
-
'toggle.editorActions',
|
|
207
|
-
'Editor Actions'
|
|
208
|
-
)),
|
|
209
|
-
toggled: ( ( ContextKeyExpr.equals(`config.${ToggleEditorActions.settingsID}`, 'hidden')).negate()),
|
|
186
|
+
title: ( localizeWithPath(_moduleId, 10, 'Editor Actions')),
|
|
187
|
+
toggled: ( (( (ContextKeyExpr.equals(`config.${ToggleEditorActions.settingsID}`, 'hidden'))).negate())),
|
|
210
188
|
menu: [
|
|
211
189
|
{ id: MenuId.TitleBarContext, order: 3, when: titleBarContextCondition, group: '2_config' },
|
|
212
190
|
{ id: MenuId.TitleBarTitleContext, order: 3, when: titleBarContextCondition, group: '2_config' }
|
|
@@ -236,24 +214,16 @@ registerAction2(class ToggleEditorActions extends Action2 {
|
|
|
236
214
|
});
|
|
237
215
|
const ACCOUNTS_ACTIVITY_TILE_ACTION = {
|
|
238
216
|
id: ACCOUNTS_ACTIVITY_ID,
|
|
239
|
-
label: ( localizeWithPath(
|
|
240
|
-
|
|
241
|
-
'accounts',
|
|
242
|
-
"Accounts"
|
|
243
|
-
)),
|
|
244
|
-
tooltip: ( localizeWithPath(
|
|
245
|
-
'vs/workbench/browser/parts/titlebar/titlebarActions',
|
|
246
|
-
'accounts',
|
|
247
|
-
"Accounts"
|
|
248
|
-
)),
|
|
217
|
+
label: ( localizeWithPath(_moduleId, 11, "Accounts")),
|
|
218
|
+
tooltip: ( localizeWithPath(_moduleId, 11, "Accounts")),
|
|
249
219
|
class: undefined,
|
|
250
220
|
enabled: true,
|
|
251
221
|
run: function () { }
|
|
252
222
|
};
|
|
253
223
|
const GLOBAL_ACTIVITY_TITLE_ACTION = {
|
|
254
224
|
id: GLOBAL_ACTIVITY_ID,
|
|
255
|
-
label: ( localizeWithPath(
|
|
256
|
-
tooltip: ( localizeWithPath(
|
|
225
|
+
label: ( localizeWithPath(_moduleId, 12, "Manage")),
|
|
226
|
+
tooltip: ( localizeWithPath(_moduleId, 12, "Manage")),
|
|
257
227
|
class: undefined,
|
|
258
228
|
enabled: true,
|
|
259
229
|
run: function () { }
|
|
@@ -32,7 +32,7 @@ import { CommandCenterControl } from './commandCenterControl.js';
|
|
|
32
32
|
import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
|
|
33
33
|
import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
|
|
34
34
|
import { GLOBAL_ACTIVITY_ID, ACCOUNTS_ACTIVITY_ID } from 'vscode/vscode/vs/workbench/common/activity';
|
|
35
|
-
import { SimpleGlobalActivityActionViewItem, SimpleAccountActivityActionViewItem } from 'vscode/vscode/vs/workbench/browser/parts/globalCompositeBar';
|
|
35
|
+
import { SimpleGlobalActivityActionViewItem, SimpleAccountActivityActionViewItem, isAccountsActionVisible, AccountsActivityActionViewItem } from 'vscode/vscode/vs/workbench/browser/parts/globalCompositeBar';
|
|
36
36
|
import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
|
|
37
37
|
import { ActionRunner } from 'vscode/vscode/vs/base/common/actions';
|
|
38
38
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
@@ -46,6 +46,7 @@ import { ACCOUNTS_ACTIVITY_TILE_ACTION, GLOBAL_ACTIVITY_TITLE_ACTION } from './t
|
|
|
46
46
|
import { createInstantHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
|
|
47
47
|
|
|
48
48
|
var AuxiliaryBrowserTitlebarPart_1;
|
|
49
|
+
const _moduleId = "vs/workbench/browser/parts/titlebar/titlebarPart";
|
|
49
50
|
let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
|
|
50
51
|
constructor(instantiationService, storageService, themeService) {
|
|
51
52
|
super('workbench.titleService', themeService, storageService);
|
|
@@ -66,11 +67,7 @@ let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
|
|
|
66
67
|
constructor() {
|
|
67
68
|
super({
|
|
68
69
|
id: `workbench.action.focusTitleBar`,
|
|
69
|
-
title: ( localize2WithPath(
|
|
70
|
-
'vs/workbench/browser/parts/titlebar/titlebarPart',
|
|
71
|
-
'focusTitleBar',
|
|
72
|
-
'Focus Title Bar'
|
|
73
|
-
)),
|
|
70
|
+
title: ( localize2WithPath(_moduleId, 0, 'Focus Title Bar')),
|
|
74
71
|
category: Categories.View,
|
|
75
72
|
f1: true,
|
|
76
73
|
});
|
|
@@ -86,7 +83,7 @@ let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
|
|
|
86
83
|
titlebarPartContainer.setAttribute('role', 'none');
|
|
87
84
|
titlebarPartContainer.style.position = 'relative';
|
|
88
85
|
container.insertBefore(titlebarPartContainer, container.firstChild);
|
|
89
|
-
const disposables = ( new DisposableStore());
|
|
86
|
+
const disposables = ( (new DisposableStore()));
|
|
90
87
|
const titlebarPart = this.doCreateAuxiliaryTitlebarPart(titlebarPartContainer, editorGroupsContainer);
|
|
91
88
|
disposables.add(this.registerPart(titlebarPart));
|
|
92
89
|
disposables.add(Event.runAndSubscribe(titlebarPart.onDidChange, () => titlebarPartContainer.style.height = `${titlebarPart.height}px`));
|
|
@@ -116,11 +113,11 @@ let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
|
|
|
116
113
|
}
|
|
117
114
|
}
|
|
118
115
|
};
|
|
119
|
-
BrowserTitleService = ( __decorate([
|
|
120
|
-
( __param(0, IInstantiationService)),
|
|
121
|
-
( __param(1, IStorageService)),
|
|
122
|
-
( __param(2, IThemeService))
|
|
123
|
-
], BrowserTitleService));
|
|
116
|
+
BrowserTitleService = ( (__decorate([
|
|
117
|
+
( (__param(0, IInstantiationService))),
|
|
118
|
+
( (__param(1, IStorageService))),
|
|
119
|
+
( (__param(2, IThemeService)))
|
|
120
|
+
], BrowserTitleService)));
|
|
124
121
|
let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
125
122
|
get minimumHeight() {
|
|
126
123
|
const value = this.isCommandCenterVisible || (isWeb && isWCOEnabled()) ? 35 : 30;
|
|
@@ -133,6 +130,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
133
130
|
this.configurationService = configurationService;
|
|
134
131
|
this.environmentService = environmentService;
|
|
135
132
|
this.instantiationService = instantiationService;
|
|
133
|
+
this.storageService = storageService;
|
|
136
134
|
this.contextKeyService = contextKeyService;
|
|
137
135
|
this.hostService = hostService;
|
|
138
136
|
this.editorGroupService = editorGroupService;
|
|
@@ -140,15 +138,16 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
140
138
|
this.keybindingService = keybindingService;
|
|
141
139
|
this.minimumWidth = 0;
|
|
142
140
|
this.maximumWidth = Number.POSITIVE_INFINITY;
|
|
143
|
-
this._onMenubarVisibilityChange = this._register(( new Emitter()));
|
|
141
|
+
this._onMenubarVisibilityChange = this._register(( (new Emitter())));
|
|
144
142
|
this.onMenubarVisibilityChange = this._onMenubarVisibilityChange.event;
|
|
145
|
-
this._onWillDispose = this._register(( new Emitter()));
|
|
143
|
+
this._onWillDispose = this._register(( (new Emitter())));
|
|
146
144
|
this.onWillDispose = this._onWillDispose.event;
|
|
147
|
-
this.actionToolBarDisposable = this._register(( new DisposableStore()));
|
|
148
|
-
this.editorActionsChangeDisposable = this._register(( new DisposableStore()));
|
|
149
|
-
this.editorToolbarMenuDisposables = this._register(( new DisposableStore()));
|
|
150
|
-
this.layoutToolbarMenuDisposables = this._register(( new DisposableStore()));
|
|
151
|
-
this.
|
|
145
|
+
this.actionToolBarDisposable = this._register(( (new DisposableStore())));
|
|
146
|
+
this.editorActionsChangeDisposable = this._register(( (new DisposableStore())));
|
|
147
|
+
this.editorToolbarMenuDisposables = this._register(( (new DisposableStore())));
|
|
148
|
+
this.layoutToolbarMenuDisposables = this._register(( (new DisposableStore())));
|
|
149
|
+
this.activityToolbarDisposables = this._register(( (new DisposableStore())));
|
|
150
|
+
this.titleDisposables = this._register(( (new DisposableStore())));
|
|
152
151
|
this.titleBarStyle = getTitleBarStyle(this.configurationService);
|
|
153
152
|
this.isInactive = false;
|
|
154
153
|
this.isAuxiliary = editorGroupsContainer !== 'main';
|
|
@@ -347,11 +346,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
347
346
|
this.actionToolBar = this.actionToolBarDisposable.add(this.instantiationService.createInstance(WorkbenchToolBar, this.actionToolBarElement, {
|
|
348
347
|
contextMenu: MenuId.TitleBarContext,
|
|
349
348
|
orientation: 0 ,
|
|
350
|
-
ariaLabel: ( localizeWithPath(
|
|
351
|
-
'vs/workbench/browser/parts/titlebar/titlebarPart',
|
|
352
|
-
'ariaLabelTitleActions',
|
|
353
|
-
"Title actions"
|
|
354
|
-
)),
|
|
349
|
+
ariaLabel: ( localizeWithPath(_moduleId, 1, "Title actions")),
|
|
355
350
|
getKeyBinding: action => this.getKeybinding(action),
|
|
356
351
|
overflowBehavior: { maxItems: 9, exempted: [ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID, ...EDITOR_CORE_NAVIGATION_COMMANDS] },
|
|
357
352
|
anchorAlignmentProvider: () => 1 ,
|
|
@@ -385,7 +380,9 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
385
380
|
);
|
|
386
381
|
}
|
|
387
382
|
if (this.activityActionsEnabled) {
|
|
388
|
-
|
|
383
|
+
if (isAccountsActionVisible(this.storageService)) {
|
|
384
|
+
actions.primary.push(ACCOUNTS_ACTIVITY_TILE_ACTION);
|
|
385
|
+
}
|
|
389
386
|
actions.primary.push(GLOBAL_ACTIVITY_TITLE_ACTION);
|
|
390
387
|
}
|
|
391
388
|
this.actionToolBar.setActions(prepareActions(actions.primary), prepareActions(actions.secondary));
|
|
@@ -394,12 +391,12 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
394
391
|
this.editorToolbarMenuDisposables.clear();
|
|
395
392
|
if (this.editorActionsEnabled && this.editorService.activeEditor !== undefined) {
|
|
396
393
|
const context = { groupId: this.editorGroupsContainer.activeGroup.id };
|
|
397
|
-
this.actionToolBar.actionRunner = ( new EditorCommandsContextActionRunner(context));
|
|
394
|
+
this.actionToolBar.actionRunner = ( (new EditorCommandsContextActionRunner(context)));
|
|
398
395
|
this.actionToolBar.context = context;
|
|
399
396
|
this.editorToolbarMenuDisposables.add(this.actionToolBar.actionRunner);
|
|
400
397
|
}
|
|
401
398
|
else {
|
|
402
|
-
this.actionToolBar.actionRunner = ( new ActionRunner());
|
|
399
|
+
this.actionToolBar.actionRunner = ( (new ActionRunner()));
|
|
403
400
|
this.actionToolBar.context = {};
|
|
404
401
|
this.editorToolbarMenuDisposables.add(this.actionToolBar.actionRunner);
|
|
405
402
|
}
|
|
@@ -415,6 +412,12 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
415
412
|
this.layoutToolbarMenu = undefined;
|
|
416
413
|
}
|
|
417
414
|
}
|
|
415
|
+
if (update.activityActions) {
|
|
416
|
+
this.activityToolbarDisposables.clear();
|
|
417
|
+
if (this.activityActionsEnabled) {
|
|
418
|
+
this.activityToolbarDisposables.add(this.storageService.onDidChangeValue(0 , AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, this._store)(() => updateToolBarActions()));
|
|
419
|
+
}
|
|
420
|
+
}
|
|
418
421
|
updateToolBarActions();
|
|
419
422
|
}
|
|
420
423
|
updateStyles() {
|
|
@@ -433,7 +436,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
433
436
|
if (this.appIconBadge) {
|
|
434
437
|
this.appIconBadge.style.backgroundColor = titleBackground;
|
|
435
438
|
}
|
|
436
|
-
if (titleBackground && ( Color.fromHex(titleBackground)).isLighter()) {
|
|
439
|
+
if (titleBackground && ( (Color.fromHex(titleBackground))).isLighter()) {
|
|
437
440
|
this.element.classList.add('light');
|
|
438
441
|
}
|
|
439
442
|
else {
|
|
@@ -446,7 +449,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
446
449
|
}
|
|
447
450
|
}
|
|
448
451
|
onContextMenu(e, menuId) {
|
|
449
|
-
const event = ( new StandardMouseEvent(getWindow(this.element), e));
|
|
452
|
+
const event = ( (new StandardMouseEvent(getWindow(this.element), e)));
|
|
450
453
|
this.contextMenuService.showContextMenu({
|
|
451
454
|
getAnchor: () => event,
|
|
452
455
|
menuId,
|
|
@@ -484,17 +487,17 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
484
487
|
return getZoomFactor(getWindow(this.element)) < 1 || !this.hasZoomableElements;
|
|
485
488
|
}
|
|
486
489
|
layout(width, height) {
|
|
487
|
-
this.updateLayout(( new Dimension(width, height)));
|
|
490
|
+
this.updateLayout(( (new Dimension(width, height))));
|
|
488
491
|
super.layoutContents(width, height);
|
|
489
492
|
}
|
|
490
493
|
updateLayout(dimension) {
|
|
491
494
|
this.lastLayoutDimensions = dimension;
|
|
492
495
|
{
|
|
493
496
|
const zoomFactor = getZoomFactor(getWindow(this.element));
|
|
494
|
-
this.element.style.setProperty('--zoom-factor', ( zoomFactor.toString()));
|
|
497
|
+
this.element.style.setProperty('--zoom-factor', ( (zoomFactor.toString())));
|
|
495
498
|
this.rootContainer.classList.toggle('counter-zoom', this.preventZoom);
|
|
496
499
|
if (this.customMenubar) {
|
|
497
|
-
const menubarDimension = ( new Dimension(0, dimension.height));
|
|
500
|
+
const menubarDimension = ( (new Dimension(0, dimension.height)));
|
|
498
501
|
this.customMenubar.layout(menubarDimension);
|
|
499
502
|
}
|
|
500
503
|
}
|
|
@@ -517,41 +520,41 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
|
|
|
517
520
|
super.dispose();
|
|
518
521
|
}
|
|
519
522
|
};
|
|
520
|
-
BrowserTitlebarPart = ( __decorate([
|
|
521
|
-
( __param(3, IContextMenuService)),
|
|
522
|
-
( __param(4, IConfigurationService)),
|
|
523
|
-
( __param(5, IBrowserWorkbenchEnvironmentService)),
|
|
524
|
-
( __param(6, IInstantiationService)),
|
|
525
|
-
( __param(7, IThemeService)),
|
|
526
|
-
( __param(8, IStorageService)),
|
|
527
|
-
( __param(9, IWorkbenchLayoutService)),
|
|
528
|
-
( __param(10, IContextKeyService)),
|
|
529
|
-
( __param(11, IHostService)),
|
|
530
|
-
( __param(12, IEditorGroupsService)),
|
|
531
|
-
( __param(13, IEditorService)),
|
|
532
|
-
( __param(14, IMenuService)),
|
|
533
|
-
( __param(15, IKeybindingService))
|
|
534
|
-
], BrowserTitlebarPart));
|
|
523
|
+
BrowserTitlebarPart = ( (__decorate([
|
|
524
|
+
( (__param(3, IContextMenuService))),
|
|
525
|
+
( (__param(4, IConfigurationService))),
|
|
526
|
+
( (__param(5, IBrowserWorkbenchEnvironmentService))),
|
|
527
|
+
( (__param(6, IInstantiationService))),
|
|
528
|
+
( (__param(7, IThemeService))),
|
|
529
|
+
( (__param(8, IStorageService))),
|
|
530
|
+
( (__param(9, IWorkbenchLayoutService))),
|
|
531
|
+
( (__param(10, IContextKeyService))),
|
|
532
|
+
( (__param(11, IHostService))),
|
|
533
|
+
( (__param(12, IEditorGroupsService))),
|
|
534
|
+
( (__param(13, IEditorService))),
|
|
535
|
+
( (__param(14, IMenuService))),
|
|
536
|
+
( (__param(15, IKeybindingService)))
|
|
537
|
+
], BrowserTitlebarPart)));
|
|
535
538
|
let MainBrowserTitlebarPart = class MainBrowserTitlebarPart extends BrowserTitlebarPart {
|
|
536
539
|
constructor(contextMenuService, configurationService, environmentService, instantiationService, themeService, storageService, layoutService, contextKeyService, hostService, editorGroupService, editorService, menuService, keybindingService) {
|
|
537
540
|
super("workbench.parts.titlebar" , mainWindow, 'main', contextMenuService, configurationService, environmentService, instantiationService, themeService, storageService, layoutService, contextKeyService, hostService, editorGroupService, editorService, menuService, keybindingService);
|
|
538
541
|
}
|
|
539
542
|
};
|
|
540
|
-
MainBrowserTitlebarPart = ( __decorate([
|
|
541
|
-
( __param(0, IContextMenuService)),
|
|
542
|
-
( __param(1, IConfigurationService)),
|
|
543
|
-
( __param(2, IBrowserWorkbenchEnvironmentService)),
|
|
544
|
-
( __param(3, IInstantiationService)),
|
|
545
|
-
( __param(4, IThemeService)),
|
|
546
|
-
( __param(5, IStorageService)),
|
|
547
|
-
( __param(6, IWorkbenchLayoutService)),
|
|
548
|
-
( __param(7, IContextKeyService)),
|
|
549
|
-
( __param(8, IHostService)),
|
|
550
|
-
( __param(9, IEditorGroupsService)),
|
|
551
|
-
( __param(10, IEditorService)),
|
|
552
|
-
( __param(11, IMenuService)),
|
|
553
|
-
( __param(12, IKeybindingService))
|
|
554
|
-
], MainBrowserTitlebarPart));
|
|
543
|
+
MainBrowserTitlebarPart = ( (__decorate([
|
|
544
|
+
( (__param(0, IContextMenuService))),
|
|
545
|
+
( (__param(1, IConfigurationService))),
|
|
546
|
+
( (__param(2, IBrowserWorkbenchEnvironmentService))),
|
|
547
|
+
( (__param(3, IInstantiationService))),
|
|
548
|
+
( (__param(4, IThemeService))),
|
|
549
|
+
( (__param(5, IStorageService))),
|
|
550
|
+
( (__param(6, IWorkbenchLayoutService))),
|
|
551
|
+
( (__param(7, IContextKeyService))),
|
|
552
|
+
( (__param(8, IHostService))),
|
|
553
|
+
( (__param(9, IEditorGroupsService))),
|
|
554
|
+
( (__param(10, IEditorService))),
|
|
555
|
+
( (__param(11, IMenuService))),
|
|
556
|
+
( (__param(12, IKeybindingService)))
|
|
557
|
+
], MainBrowserTitlebarPart)));
|
|
555
558
|
let AuxiliaryBrowserTitlebarPart = class AuxiliaryBrowserTitlebarPart extends BrowserTitlebarPart {
|
|
556
559
|
static { AuxiliaryBrowserTitlebarPart_1 = this; }
|
|
557
560
|
static { this.COUNTER = 1; }
|
|
@@ -566,20 +569,20 @@ let AuxiliaryBrowserTitlebarPart = class AuxiliaryBrowserTitlebarPart extends Br
|
|
|
566
569
|
return getZoomFactor(getWindow(this.element)) < 1 || !this.mainTitlebar.hasZoomableElements;
|
|
567
570
|
}
|
|
568
571
|
};
|
|
569
|
-
AuxiliaryBrowserTitlebarPart = AuxiliaryBrowserTitlebarPart_1 = ( __decorate([
|
|
570
|
-
( __param(3, IContextMenuService)),
|
|
571
|
-
( __param(4, IConfigurationService)),
|
|
572
|
-
( __param(5, IBrowserWorkbenchEnvironmentService)),
|
|
573
|
-
( __param(6, IInstantiationService)),
|
|
574
|
-
( __param(7, IThemeService)),
|
|
575
|
-
( __param(8, IStorageService)),
|
|
576
|
-
( __param(9, IWorkbenchLayoutService)),
|
|
577
|
-
( __param(10, IContextKeyService)),
|
|
578
|
-
( __param(11, IHostService)),
|
|
579
|
-
( __param(12, IEditorGroupsService)),
|
|
580
|
-
( __param(13, IEditorService)),
|
|
581
|
-
( __param(14, IMenuService)),
|
|
582
|
-
( __param(15, IKeybindingService))
|
|
583
|
-
], AuxiliaryBrowserTitlebarPart));
|
|
572
|
+
AuxiliaryBrowserTitlebarPart = AuxiliaryBrowserTitlebarPart_1 = ( (__decorate([
|
|
573
|
+
( (__param(3, IContextMenuService))),
|
|
574
|
+
( (__param(4, IConfigurationService))),
|
|
575
|
+
( (__param(5, IBrowserWorkbenchEnvironmentService))),
|
|
576
|
+
( (__param(6, IInstantiationService))),
|
|
577
|
+
( (__param(7, IThemeService))),
|
|
578
|
+
( (__param(8, IStorageService))),
|
|
579
|
+
( (__param(9, IWorkbenchLayoutService))),
|
|
580
|
+
( (__param(10, IContextKeyService))),
|
|
581
|
+
( (__param(11, IHostService))),
|
|
582
|
+
( (__param(12, IEditorGroupsService))),
|
|
583
|
+
( (__param(13, IEditorService))),
|
|
584
|
+
( (__param(14, IMenuService))),
|
|
585
|
+
( (__param(15, IKeybindingService)))
|
|
586
|
+
], AuxiliaryBrowserTitlebarPart)));
|
|
584
587
|
|
|
585
588
|
export { AuxiliaryBrowserTitlebarPart, BrowserTitleService, BrowserTitlebarPart, MainBrowserTitlebarPart };
|