custom-electron-titlebar 3.2.4 → 3.2.8
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/.vscode/launch.json +49 -0
- package/.vscode/tasks.json +34 -0
- package/README.md +3 -11
- package/_config.yml +1 -0
- package/{lib → build}/browser/browser.d.ts +0 -0
- package/{lib → build}/browser/browser.js +1 -0
- package/build/browser/browser.js.map +1 -0
- package/{lib → build}/browser/event.d.ts +0 -0
- package/{lib → build}/browser/event.js +3 -1
- package/build/browser/event.js.map +1 -0
- package/{lib → build}/browser/iframe.d.ts +0 -0
- package/{lib → build}/browser/iframe.js +1 -0
- package/build/browser/iframe.js.map +1 -0
- package/{lib → build}/browser/keyboardEvent.d.ts +0 -0
- package/{lib → build}/browser/keyboardEvent.js +1 -0
- package/build/browser/keyboardEvent.js.map +1 -0
- package/{lib → build}/browser/mouseEvent.d.ts +0 -0
- package/{lib → build}/browser/mouseEvent.js +1 -0
- package/build/browser/mouseEvent.js.map +1 -0
- package/{lib → build}/common/arrays.d.ts +0 -0
- package/{lib → build}/common/arrays.js +1 -0
- package/build/common/arrays.js.map +1 -0
- package/{lib → build}/common/async.d.ts +0 -0
- package/{lib → build}/common/async.js +1 -0
- package/build/common/async.js.map +1 -0
- package/{lib → build}/common/charCode.d.ts +0 -0
- package/{lib → build}/common/charCode.js +1 -0
- package/build/common/charCode.js.map +1 -0
- package/{lib → build}/common/color.d.ts +0 -0
- package/{lib → build}/common/color.js +1 -0
- package/build/common/color.js.map +1 -0
- package/{lib → build}/common/dom.d.ts +0 -0
- package/{lib → build}/common/dom.js +17 -14
- package/build/common/dom.js.map +1 -0
- package/{lib → build}/common/event.d.ts +0 -0
- package/{lib → build}/common/event.js +2 -1
- package/build/common/event.js.map +1 -0
- package/{lib → build}/common/iterator.d.ts +0 -0
- package/{lib → build}/common/iterator.js +1 -0
- package/build/common/iterator.js.map +1 -0
- package/{lib → build}/common/keyCodes.d.ts +0 -0
- package/{lib → build}/common/keyCodes.js +1 -0
- package/build/common/keyCodes.js.map +1 -0
- package/{lib → build}/common/lifecycle.d.ts +0 -0
- package/{lib → build}/common/lifecycle.js +1 -0
- package/build/common/lifecycle.js.map +1 -0
- package/{lib → build}/common/linkedList.d.ts +0 -0
- package/{lib → build}/common/linkedList.js +1 -0
- package/build/common/linkedList.js.map +1 -0
- package/{lib → build}/common/platform.d.ts +0 -0
- package/{lib → build}/common/platform.js +1 -0
- package/build/common/platform.js.map +1 -0
- package/{lib → build}/index.d.ts +0 -0
- package/{lib → build}/index.js +2 -1
- package/build/index.js.map +1 -0
- package/{lib → build}/menu/menu.d.ts +0 -0
- package/{lib → build}/menu/menu.js +39 -38
- package/build/menu/menu.js.map +1 -0
- package/{lib → build}/menu/menuitem.d.ts +10 -2
- package/{lib → build}/menu/menuitem.js +71 -29
- package/build/menu/menuitem.js.map +1 -0
- package/{lib → build}/menubar.d.ts +0 -0
- package/{lib → build}/menubar.js +38 -34
- package/build/menubar.js.map +1 -0
- package/{lib → build}/themebar.d.ts +0 -0
- package/{lib → build}/themebar.js +31 -2
- package/build/themebar.js.map +1 -0
- package/{lib → build}/titlebar.d.ts +0 -0
- package/{lib → build}/titlebar.js +72 -59
- package/build/titlebar.js.map +1 -0
- package/package.json +14 -8
|
@@ -11,18 +11,19 @@
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CETMenuItem = void 0;
|
|
13
13
|
const dom_1 = require("../common/dom");
|
|
14
|
-
const
|
|
14
|
+
const remote = require("@electron/remote");
|
|
15
15
|
const menu_1 = require("./menu");
|
|
16
16
|
const keyCodes_1 = require("../common/keyCodes");
|
|
17
17
|
const lifecycle_1 = require("../common/lifecycle");
|
|
18
18
|
const platform_1 = require("../common/platform");
|
|
19
19
|
class CETMenuItem extends lifecycle_1.Disposable {
|
|
20
|
-
constructor(item, options = {}, closeSubMenu = () => { }) {
|
|
20
|
+
constructor(item, options = {}, closeSubMenu = () => { }, menuContainer = undefined) {
|
|
21
21
|
super();
|
|
22
22
|
this.item = item;
|
|
23
23
|
this.options = options;
|
|
24
|
-
this.currentWindow =
|
|
24
|
+
this.currentWindow = remote.getCurrentWindow();
|
|
25
25
|
this.closeSubMenu = closeSubMenu;
|
|
26
|
+
this.menuContainer = menuContainer;
|
|
26
27
|
// Set mnemonic
|
|
27
28
|
if (this.item.label && options.enableMnemonics) {
|
|
28
29
|
let label = this.item.label;
|
|
@@ -48,35 +49,35 @@ class CETMenuItem extends lifecycle_1.Disposable {
|
|
|
48
49
|
}
|
|
49
50
|
render(container) {
|
|
50
51
|
this.container = container;
|
|
51
|
-
this._register(dom_1.addDisposableListener(this.container, dom_1.EventType.MOUSE_DOWN, e => {
|
|
52
|
+
this._register((0, dom_1.addDisposableListener)(this.container, dom_1.EventType.MOUSE_DOWN, e => {
|
|
52
53
|
if (this.item.enabled && e.button === 0 && this.container) {
|
|
53
|
-
dom_1.addClass(this.container, 'active');
|
|
54
|
+
(0, dom_1.addClass)(this.container, 'active');
|
|
54
55
|
}
|
|
55
56
|
}));
|
|
56
|
-
this._register(dom_1.addDisposableListener(this.container, dom_1.EventType.CLICK, e => {
|
|
57
|
+
this._register((0, dom_1.addDisposableListener)(this.container, dom_1.EventType.CLICK, e => {
|
|
57
58
|
if (this.item.enabled) {
|
|
58
59
|
this.onClick(e);
|
|
59
60
|
}
|
|
60
61
|
}));
|
|
61
|
-
this._register(dom_1.addDisposableListener(this.container, dom_1.EventType.DBLCLICK, e => {
|
|
62
|
+
this._register((0, dom_1.addDisposableListener)(this.container, dom_1.EventType.DBLCLICK, e => {
|
|
62
63
|
dom_1.EventHelper.stop(e, true);
|
|
63
64
|
}));
|
|
64
65
|
[dom_1.EventType.MOUSE_UP, dom_1.EventType.MOUSE_OUT].forEach(event => {
|
|
65
|
-
this._register(dom_1.addDisposableListener(this.container, event, e => {
|
|
66
|
+
this._register((0, dom_1.addDisposableListener)(this.container, event, e => {
|
|
66
67
|
dom_1.EventHelper.stop(e);
|
|
67
|
-
dom_1.removeClass(this.container, 'active');
|
|
68
|
+
(0, dom_1.removeClass)(this.container, 'active');
|
|
68
69
|
}));
|
|
69
70
|
});
|
|
70
|
-
this.itemElement = dom_1.append(this.container, dom_1.$('a.action-menu-item'));
|
|
71
|
+
this.itemElement = (0, dom_1.append)(this.container, (0, dom_1.$)('a.action-menu-item'));
|
|
71
72
|
this.itemElement.setAttribute('role', 'menuitem');
|
|
72
73
|
if (this.mnemonic) {
|
|
73
74
|
this.itemElement.setAttribute('aria-keyshortcuts', `${this.mnemonic}`);
|
|
74
75
|
}
|
|
75
|
-
this.checkElement = dom_1.append(this.itemElement, dom_1.$('span.menu-item-check'));
|
|
76
|
+
this.checkElement = (0, dom_1.append)(this.itemElement, (0, dom_1.$)('span.menu-item-check'));
|
|
76
77
|
this.checkElement.setAttribute('role', 'none');
|
|
77
|
-
this.iconElement = dom_1.append(this.itemElement, dom_1.$('span.menu-item-icon'));
|
|
78
|
+
this.iconElement = (0, dom_1.append)(this.itemElement, (0, dom_1.$)('span.menu-item-icon'));
|
|
78
79
|
this.iconElement.setAttribute('role', 'none');
|
|
79
|
-
this.labelElement = dom_1.append(this.itemElement, dom_1.$('span.action-label'));
|
|
80
|
+
this.labelElement = (0, dom_1.append)(this.itemElement, (0, dom_1.$)('span.action-label'));
|
|
80
81
|
this.setAccelerator();
|
|
81
82
|
this.updateLabel();
|
|
82
83
|
this.updateIcon();
|
|
@@ -87,26 +88,28 @@ class CETMenuItem extends lifecycle_1.Disposable {
|
|
|
87
88
|
}
|
|
88
89
|
onClick(event) {
|
|
89
90
|
dom_1.EventHelper.stop(event, true);
|
|
90
|
-
|
|
91
|
-
this.item.click(this.item, this.currentWindow, this.event);
|
|
92
|
-
}
|
|
91
|
+
this.item.click(this.event, this.currentWindow, this.currentWindow.webContents);
|
|
93
92
|
if (this.item.type === 'checkbox') {
|
|
94
|
-
this.item.checked = !this.item.checked;
|
|
95
93
|
this.updateChecked();
|
|
96
94
|
}
|
|
97
|
-
this.
|
|
95
|
+
else if (this.item.type === 'radio') {
|
|
96
|
+
this.updateRadioGroup();
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
this.closeSubMenu();
|
|
100
|
+
}
|
|
98
101
|
}
|
|
99
102
|
focus() {
|
|
100
103
|
if (this.container) {
|
|
101
104
|
this.container.focus();
|
|
102
|
-
dom_1.addClass(this.container, 'focused');
|
|
105
|
+
(0, dom_1.addClass)(this.container, 'focused');
|
|
103
106
|
}
|
|
104
107
|
this.applyStyle();
|
|
105
108
|
}
|
|
106
109
|
blur() {
|
|
107
110
|
if (this.container) {
|
|
108
111
|
this.container.blur();
|
|
109
|
-
dom_1.removeClass(this.container, 'focused');
|
|
112
|
+
(0, dom_1.removeClass)(this.container, 'focused');
|
|
110
113
|
}
|
|
111
114
|
this.applyStyle();
|
|
112
115
|
}
|
|
@@ -165,14 +168,14 @@ class CETMenuItem extends lifecycle_1.Disposable {
|
|
|
165
168
|
accelerator = this.item.accelerator;
|
|
166
169
|
}
|
|
167
170
|
if (accelerator !== null) {
|
|
168
|
-
dom_1.append(this.itemElement, dom_1.$('span.keybinding')).textContent = parseAccelerator(accelerator);
|
|
171
|
+
(0, dom_1.append)(this.itemElement, (0, dom_1.$)('span.keybinding')).textContent = parseAccelerator(accelerator);
|
|
169
172
|
}
|
|
170
173
|
}
|
|
171
174
|
updateLabel() {
|
|
172
175
|
if (this.item.label) {
|
|
173
176
|
let label = this.item.label;
|
|
174
177
|
if (label) {
|
|
175
|
-
const cleanLabel = menu_1.cleanMnemonic(label);
|
|
178
|
+
const cleanLabel = (0, menu_1.cleanMnemonic)(label);
|
|
176
179
|
if (!this.options.enableMnemonics) {
|
|
177
180
|
label = cleanLabel;
|
|
178
181
|
}
|
|
@@ -212,7 +215,7 @@ class CETMenuItem extends lifecycle_1.Disposable {
|
|
|
212
215
|
icon = this.item.icon;
|
|
213
216
|
}
|
|
214
217
|
if (icon) {
|
|
215
|
-
const iconE = dom_1.append(this.iconElement, dom_1.$('img'));
|
|
218
|
+
const iconE = (0, dom_1.append)(this.iconElement, (0, dom_1.$)('img'));
|
|
216
219
|
iconE.setAttribute('src', icon.toString());
|
|
217
220
|
}
|
|
218
221
|
}
|
|
@@ -233,11 +236,11 @@ class CETMenuItem extends lifecycle_1.Disposable {
|
|
|
233
236
|
}
|
|
234
237
|
updateEnabled() {
|
|
235
238
|
if (this.item.enabled && this.item.type !== 'separator') {
|
|
236
|
-
dom_1.removeClass(this.container, 'disabled');
|
|
239
|
+
(0, dom_1.removeClass)(this.container, 'disabled');
|
|
237
240
|
this.container.tabIndex = 0;
|
|
238
241
|
}
|
|
239
242
|
else {
|
|
240
|
-
dom_1.addClass(this.container, 'disabled');
|
|
243
|
+
(0, dom_1.addClass)(this.container, 'disabled');
|
|
241
244
|
}
|
|
242
245
|
}
|
|
243
246
|
updateVisibility() {
|
|
@@ -247,19 +250,57 @@ class CETMenuItem extends lifecycle_1.Disposable {
|
|
|
247
250
|
}
|
|
248
251
|
updateChecked() {
|
|
249
252
|
if (this.item.checked) {
|
|
250
|
-
dom_1.addClass(this.itemElement, 'checked');
|
|
253
|
+
(0, dom_1.addClass)(this.itemElement, 'checked');
|
|
251
254
|
this.itemElement.setAttribute('role', 'menuitemcheckbox');
|
|
252
255
|
this.itemElement.setAttribute('aria-checked', 'true');
|
|
253
256
|
}
|
|
254
257
|
else {
|
|
255
|
-
dom_1.removeClass(this.itemElement, 'checked');
|
|
258
|
+
(0, dom_1.removeClass)(this.itemElement, 'checked');
|
|
256
259
|
this.itemElement.setAttribute('role', 'menuitem');
|
|
257
260
|
this.itemElement.setAttribute('aria-checked', 'false');
|
|
258
261
|
}
|
|
259
262
|
}
|
|
263
|
+
updateRadioGroup() {
|
|
264
|
+
if (this.radioGroup === undefined) {
|
|
265
|
+
this.radioGroup = this.getRadioGroup();
|
|
266
|
+
}
|
|
267
|
+
for (let i = this.radioGroup.start; i < this.radioGroup.end; i++) {
|
|
268
|
+
const menuItem = this.menuContainer[i];
|
|
269
|
+
if (menuItem instanceof CETMenuItem && menuItem.item.type === 'radio') {
|
|
270
|
+
// updateChecked() *all* radio buttons in group
|
|
271
|
+
menuItem.updateChecked();
|
|
272
|
+
// set the radioGroup property of all the other radio buttons since it was already calculated
|
|
273
|
+
if (menuItem !== this) {
|
|
274
|
+
menuItem.radioGroup = this.radioGroup;
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
/** radioGroup index's starts with (previous separator +1 OR menuContainer[0]) and ends with (next separator OR menuContainer[length]) */
|
|
280
|
+
getRadioGroup() {
|
|
281
|
+
let startIndex = 0;
|
|
282
|
+
let endIndex = this.menuContainer.length;
|
|
283
|
+
let found = false;
|
|
284
|
+
for (const index in this.menuContainer) {
|
|
285
|
+
const menuItem = this.menuContainer[index];
|
|
286
|
+
if (menuItem === this) {
|
|
287
|
+
found = true;
|
|
288
|
+
}
|
|
289
|
+
else if (menuItem instanceof CETMenuItem && menuItem.isSeparator()) {
|
|
290
|
+
if (found) {
|
|
291
|
+
endIndex = Number.parseInt(index);
|
|
292
|
+
break;
|
|
293
|
+
}
|
|
294
|
+
else {
|
|
295
|
+
startIndex = Number.parseInt(index) + 1;
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
return { start: startIndex, end: endIndex };
|
|
300
|
+
}
|
|
260
301
|
dispose() {
|
|
261
302
|
if (this.itemElement) {
|
|
262
|
-
dom_1.removeNode(this.itemElement);
|
|
303
|
+
(0, dom_1.removeNode)(this.itemElement);
|
|
263
304
|
this.itemElement = undefined;
|
|
264
305
|
}
|
|
265
306
|
super.dispose();
|
|
@@ -271,7 +312,7 @@ class CETMenuItem extends lifecycle_1.Disposable {
|
|
|
271
312
|
if (!this.menuStyle) {
|
|
272
313
|
return;
|
|
273
314
|
}
|
|
274
|
-
const isSelected = this.container && dom_1.hasClass(this.container, 'focused');
|
|
315
|
+
const isSelected = this.container && (0, dom_1.hasClass)(this.container, 'focused');
|
|
275
316
|
const fgColor = isSelected && this.menuStyle.selectionForegroundColor ? this.menuStyle.selectionForegroundColor : this.menuStyle.foregroundColor;
|
|
276
317
|
const bgColor = isSelected && this.menuStyle.selectionBackgroundColor ? this.menuStyle.selectionBackgroundColor : this.menuStyle.backgroundColor;
|
|
277
318
|
this.checkElement.style.backgroundColor = fgColor ? fgColor.toString() : null;
|
|
@@ -295,3 +336,4 @@ function parseAccelerator(a) {
|
|
|
295
336
|
accelerator = accelerator.replace(/(Or)/gi, '');
|
|
296
337
|
return accelerator;
|
|
297
338
|
}
|
|
339
|
+
//# sourceMappingURL=menuitem.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"menuitem.js","sourceRoot":"","sources":["../../src/menu/menuitem.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
package/{lib → build}/menubar.js
RENAMED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
*-------------------------------------------------------------------------------------------------------*/
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.escape = exports.Menubar = void 0;
|
|
13
|
-
const
|
|
13
|
+
const remote = require("@electron/remote");
|
|
14
14
|
const dom_1 = require("./common/dom");
|
|
15
15
|
const menu_1 = require("./menu/menu");
|
|
16
16
|
const keyboardEvent_1 = require("./browser/keyboardEvent");
|
|
@@ -38,7 +38,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
38
38
|
this._onVisibilityChange = this._register(new event_1.Emitter());
|
|
39
39
|
this._onFocusStateChange = this._register(new event_1.Emitter());
|
|
40
40
|
this._register(ModifierKeyEmitter.getInstance().event(this.onModifierKeyToggled, this));
|
|
41
|
-
this._register(dom_1.addDisposableListener(this.container, dom_1.EventType.KEY_DOWN, (e) => {
|
|
41
|
+
this._register((0, dom_1.addDisposableListener)(this.container, dom_1.EventType.KEY_DOWN, (e) => {
|
|
42
42
|
let event = new keyboardEvent_1.StandardKeyboardEvent(e);
|
|
43
43
|
let eventHandled = true;
|
|
44
44
|
const key = !!e.key ? keyCodes_1.KeyCodeUtils.fromString(e.key) : 0 /* Unknown */;
|
|
@@ -63,13 +63,13 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
63
63
|
event.stopPropagation();
|
|
64
64
|
}
|
|
65
65
|
}));
|
|
66
|
-
this._register(dom_1.addDisposableListener(window, dom_1.EventType.MOUSE_DOWN, () => {
|
|
66
|
+
this._register((0, dom_1.addDisposableListener)(window, dom_1.EventType.MOUSE_DOWN, () => {
|
|
67
67
|
// This mouse event is outside the menubar so it counts as a focus out
|
|
68
68
|
if (this.isFocused) {
|
|
69
69
|
this.setUnfocusedState();
|
|
70
70
|
}
|
|
71
71
|
}));
|
|
72
|
-
this._register(dom_1.addDisposableListener(this.container, dom_1.EventType.FOCUS_IN, (e) => {
|
|
72
|
+
this._register((0, dom_1.addDisposableListener)(this.container, dom_1.EventType.FOCUS_IN, (e) => {
|
|
73
73
|
let event = e;
|
|
74
74
|
if (event.relatedTarget) {
|
|
75
75
|
if (!this.container.contains(event.relatedTarget)) {
|
|
@@ -77,7 +77,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
}));
|
|
80
|
-
this._register(dom_1.addDisposableListener(this.container, dom_1.EventType.FOCUS_OUT, (e) => {
|
|
80
|
+
this._register((0, dom_1.addDisposableListener)(this.container, dom_1.EventType.FOCUS_OUT, (e) => {
|
|
81
81
|
let event = e;
|
|
82
82
|
if (event.relatedTarget) {
|
|
83
83
|
if (!this.container.contains(event.relatedTarget)) {
|
|
@@ -86,7 +86,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
}));
|
|
89
|
-
this._register(dom_1.addDisposableListener(window, dom_1.EventType.KEY_DOWN, (e) => {
|
|
89
|
+
this._register((0, dom_1.addDisposableListener)(window, dom_1.EventType.KEY_DOWN, (e) => {
|
|
90
90
|
if (!this.options.enableMnemonics || !e.altKey || e.ctrlKey || e.defaultPrevented) {
|
|
91
91
|
return;
|
|
92
92
|
}
|
|
@@ -104,7 +104,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
104
104
|
}
|
|
105
105
|
registerListeners() {
|
|
106
106
|
if (!platform_1.isMacintosh) {
|
|
107
|
-
this._register(dom_1.addDisposableListener(window, dom_1.EventType.RESIZE, () => {
|
|
107
|
+
this._register((0, dom_1.addDisposableListener)(window, dom_1.EventType.RESIZE, () => {
|
|
108
108
|
this.blur();
|
|
109
109
|
}));
|
|
110
110
|
}
|
|
@@ -115,14 +115,14 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
115
115
|
this._register(this.onVisibilityChange(e => this._onVisibilityChange.fire(e)));
|
|
116
116
|
topLevelMenus.forEach((menubarMenu) => {
|
|
117
117
|
const menuIndex = this.menuItems.length;
|
|
118
|
-
const cleanMenuLabel = menu_1.cleanMnemonic(menubarMenu.label);
|
|
119
|
-
const buttonElement = dom_1.$('div.menubar-menu-button', { 'role': 'menuitem', 'tabindex': -1, 'aria-label': cleanMenuLabel, 'aria-haspopup': true });
|
|
118
|
+
const cleanMenuLabel = (0, menu_1.cleanMnemonic)(menubarMenu.label);
|
|
119
|
+
const buttonElement = (0, dom_1.$)('div.menubar-menu-button', { 'role': 'menuitem', 'tabindex': -1, 'aria-label': cleanMenuLabel, 'aria-haspopup': true });
|
|
120
120
|
if (!menubarMenu.enabled) {
|
|
121
|
-
dom_1.addClass(buttonElement, 'disabled');
|
|
121
|
+
(0, dom_1.addClass)(buttonElement, 'disabled');
|
|
122
122
|
}
|
|
123
|
-
const titleElement = dom_1.$('div.menubar-menu-title', { 'role': 'none', 'aria-hidden': true });
|
|
123
|
+
const titleElement = (0, dom_1.$)('div.menubar-menu-title', { 'role': 'none', 'aria-hidden': true });
|
|
124
124
|
buttonElement.appendChild(titleElement);
|
|
125
|
-
dom_1.append(this.container, buttonElement);
|
|
125
|
+
(0, dom_1.append)(this.container, buttonElement);
|
|
126
126
|
let mnemonicMatches = menu_1.MENU_MNEMONIC_REGEX.exec(menubarMenu.label);
|
|
127
127
|
// Register mnemonics
|
|
128
128
|
if (mnemonicMatches) {
|
|
@@ -131,7 +131,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
131
131
|
}
|
|
132
132
|
this.updateLabels(titleElement, buttonElement, menubarMenu.label);
|
|
133
133
|
if (menubarMenu.enabled) {
|
|
134
|
-
this._register(dom_1.addDisposableListener(buttonElement, dom_1.EventType.KEY_UP, (e) => {
|
|
134
|
+
this._register((0, dom_1.addDisposableListener)(buttonElement, dom_1.EventType.KEY_UP, (e) => {
|
|
135
135
|
let event = new keyboardEvent_1.StandardKeyboardEvent(e);
|
|
136
136
|
let eventHandled = true;
|
|
137
137
|
if ((event.equals(18 /* DownArrow */) || event.equals(3 /* Enter */)) && !this.isOpen) {
|
|
@@ -147,7 +147,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
147
147
|
event.stopPropagation();
|
|
148
148
|
}
|
|
149
149
|
}));
|
|
150
|
-
this._register(dom_1.addDisposableListener(buttonElement, dom_1.EventType.MOUSE_DOWN, (e) => {
|
|
150
|
+
this._register((0, dom_1.addDisposableListener)(buttonElement, dom_1.EventType.MOUSE_DOWN, (e) => {
|
|
151
151
|
if (!this.isOpen) {
|
|
152
152
|
// Open the menu with mouse down and ignore the following mouse up event
|
|
153
153
|
this.ignoreNextMouseUp = true;
|
|
@@ -159,7 +159,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
159
159
|
e.preventDefault();
|
|
160
160
|
e.stopPropagation();
|
|
161
161
|
}));
|
|
162
|
-
this._register(dom_1.addDisposableListener(buttonElement, dom_1.EventType.MOUSE_UP, () => {
|
|
162
|
+
this._register((0, dom_1.addDisposableListener)(buttonElement, dom_1.EventType.MOUSE_UP, () => {
|
|
163
163
|
if (!this.ignoreNextMouseUp) {
|
|
164
164
|
if (this.isFocused) {
|
|
165
165
|
this.onMenuTriggered(menuIndex, true);
|
|
@@ -169,7 +169,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
169
169
|
this.ignoreNextMouseUp = false;
|
|
170
170
|
}
|
|
171
171
|
}));
|
|
172
|
-
this._register(dom_1.addDisposableListener(buttonElement, dom_1.EventType.MOUSE_ENTER, () => {
|
|
172
|
+
this._register((0, dom_1.addDisposableListener)(buttonElement, dom_1.EventType.MOUSE_ENTER, () => {
|
|
173
173
|
if (this.isOpen && !this.isCurrentMenu(menuIndex)) {
|
|
174
174
|
this.menuItems[menuIndex].buttonElement.focus();
|
|
175
175
|
this.cleanupMenu();
|
|
@@ -194,9 +194,8 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
194
194
|
onClick(menuIndex) {
|
|
195
195
|
let electronEvent;
|
|
196
196
|
const item = this.menuItems[menuIndex].menuItem;
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
}
|
|
197
|
+
const browserWindow = remote.getCurrentWindow();
|
|
198
|
+
item.click(electronEvent, browserWindow, browserWindow.webContents);
|
|
200
199
|
}
|
|
201
200
|
get onVisibilityChange() {
|
|
202
201
|
return this._onVisibilityChange.event;
|
|
@@ -207,8 +206,8 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
207
206
|
dispose() {
|
|
208
207
|
super.dispose();
|
|
209
208
|
this.menuItems.forEach(menuBarMenu => {
|
|
210
|
-
dom_1.removeNode(menuBarMenu.titleElement);
|
|
211
|
-
dom_1.removeNode(menuBarMenu.buttonElement);
|
|
209
|
+
(0, dom_1.removeNode)(menuBarMenu.titleElement);
|
|
210
|
+
(0, dom_1.removeNode)(menuBarMenu.buttonElement);
|
|
212
211
|
});
|
|
213
212
|
}
|
|
214
213
|
blur() {
|
|
@@ -218,7 +217,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
218
217
|
this.menuStyle = style;
|
|
219
218
|
}
|
|
220
219
|
updateLabels(titleElement, buttonElement, label) {
|
|
221
|
-
const cleanMenuLabel = menu_1.cleanMnemonic(label);
|
|
220
|
+
const cleanMenuLabel = (0, menu_1.cleanMnemonic)(label);
|
|
222
221
|
// Update the button label to reflect mnemonics
|
|
223
222
|
if (this.options.enableMnemonics) {
|
|
224
223
|
let innerHtml = escape(label);
|
|
@@ -474,7 +473,7 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
474
473
|
this.menuItems[this.focusedMenu.index].buttonElement.focus();
|
|
475
474
|
if (this.focusedMenu.holder) {
|
|
476
475
|
if (this.focusedMenu.holder.parentElement) {
|
|
477
|
-
dom_1.removeClass(this.focusedMenu.holder.parentElement, 'open');
|
|
476
|
+
(0, dom_1.removeClass)(this.focusedMenu.holder.parentElement, 'open');
|
|
478
477
|
}
|
|
479
478
|
this.focusedMenu.holder.remove();
|
|
480
479
|
}
|
|
@@ -486,16 +485,20 @@ class Menubar extends lifecycle_1.Disposable {
|
|
|
486
485
|
}
|
|
487
486
|
showMenu(menuIndex, selectFirst = true) {
|
|
488
487
|
const customMenu = this.menuItems[menuIndex];
|
|
489
|
-
const
|
|
490
|
-
|
|
488
|
+
const btnElement = customMenu.buttonElement;
|
|
489
|
+
const btnRect = btnElement.getBoundingClientRect();
|
|
490
|
+
const menuHolder = (0, dom_1.$)('ul.menubar-menu-container');
|
|
491
|
+
(0, dom_1.addClass)(btnElement, 'open');
|
|
491
492
|
menuHolder.setAttribute('role', 'menu');
|
|
492
493
|
menuHolder.tabIndex = 0;
|
|
493
|
-
menuHolder.style.top = `${
|
|
494
|
-
menuHolder.style.left = `${
|
|
495
|
-
|
|
494
|
+
menuHolder.style.top = `${btnRect.bottom}px`;
|
|
495
|
+
menuHolder.style.left = `${btnRect.left}px`;
|
|
496
|
+
btnElement.appendChild(menuHolder);
|
|
497
|
+
// menuHolder.style.maxHeight = `200px`;
|
|
498
|
+
menuHolder.style.maxHeight = `${Math.max(10, window.innerHeight - btnRect.top - 50)}px`;
|
|
496
499
|
let menuOptions = {
|
|
497
500
|
enableMnemonics: this.mnemonicsInUse && this.options.enableMnemonics,
|
|
498
|
-
ariaLabel:
|
|
501
|
+
ariaLabel: btnElement.attributes['aria-label'].value
|
|
499
502
|
};
|
|
500
503
|
let menuWidget = new menu_1.CETMenu(menuHolder, menuOptions, this.closeSubMenu);
|
|
501
504
|
menuWidget.createMenu(customMenu.submenu.items);
|
|
@@ -521,7 +524,7 @@ class ModifierKeyEmitter extends event_1.Emitter {
|
|
|
521
524
|
shiftKey: false,
|
|
522
525
|
ctrlKey: false
|
|
523
526
|
};
|
|
524
|
-
this._subscriptions.push(event_2.domEvent(document.body, 'keydown', true)(e => {
|
|
527
|
+
this._subscriptions.push((0, event_2.domEvent)(document.body, 'keydown', true)(e => {
|
|
525
528
|
const event = new keyboardEvent_1.StandardKeyboardEvent(e);
|
|
526
529
|
if (e.altKey && !this._keyStatus.altKey) {
|
|
527
530
|
this._keyStatus.lastKeyPressed = 'alt';
|
|
@@ -545,7 +548,7 @@ class ModifierKeyEmitter extends event_1.Emitter {
|
|
|
545
548
|
this.fire(this._keyStatus);
|
|
546
549
|
}
|
|
547
550
|
}));
|
|
548
|
-
this._subscriptions.push(event_2.domEvent(document.body, 'keyup', true)(e => {
|
|
551
|
+
this._subscriptions.push((0, event_2.domEvent)(document.body, 'keyup', true)(e => {
|
|
549
552
|
if (!e.altKey && this._keyStatus.altKey) {
|
|
550
553
|
this._keyStatus.lastKeyReleased = 'alt';
|
|
551
554
|
}
|
|
@@ -568,10 +571,10 @@ class ModifierKeyEmitter extends event_1.Emitter {
|
|
|
568
571
|
this.fire(this._keyStatus);
|
|
569
572
|
}
|
|
570
573
|
}));
|
|
571
|
-
this._subscriptions.push(event_2.domEvent(document.body, 'mousedown', true)(e => {
|
|
574
|
+
this._subscriptions.push((0, event_2.domEvent)(document.body, 'mousedown', true)(e => {
|
|
572
575
|
this._keyStatus.lastKeyPressed = undefined;
|
|
573
576
|
}));
|
|
574
|
-
this._subscriptions.push(event_2.domEvent(window, 'blur')(e => {
|
|
577
|
+
this._subscriptions.push((0, event_2.domEvent)(window, 'blur')(e => {
|
|
575
578
|
this._keyStatus.lastKeyPressed = undefined;
|
|
576
579
|
this._keyStatus.lastKeyReleased = undefined;
|
|
577
580
|
this._keyStatus.altKey = false;
|
|
@@ -588,7 +591,7 @@ class ModifierKeyEmitter extends event_1.Emitter {
|
|
|
588
591
|
}
|
|
589
592
|
dispose() {
|
|
590
593
|
super.dispose();
|
|
591
|
-
this._subscriptions = lifecycle_1.dispose(this._subscriptions);
|
|
594
|
+
this._subscriptions = (0, lifecycle_1.dispose)(this._subscriptions);
|
|
592
595
|
}
|
|
593
596
|
}
|
|
594
597
|
function escape(html) {
|
|
@@ -602,3 +605,4 @@ function escape(html) {
|
|
|
602
605
|
});
|
|
603
606
|
}
|
|
604
607
|
exports.escape = escape;
|
|
608
|
+
//# sourceMappingURL=menubar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"menubar.js","sourceRoot":"","sources":["../src/menubar.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -17,7 +17,7 @@ class ThemingRegistry extends lifecycle_1.Disposable {
|
|
|
17
17
|
}
|
|
18
18
|
onThemeChange(theme) {
|
|
19
19
|
this.theming.push(theme);
|
|
20
|
-
return lifecycle_1.toDisposable(() => {
|
|
20
|
+
return (0, lifecycle_1.toDisposable)(() => {
|
|
21
21
|
const idx = this.theming.indexOf(theme);
|
|
22
22
|
this.theming.splice(idx, 1);
|
|
23
23
|
});
|
|
@@ -162,12 +162,28 @@ class Themebar extends ThemingRegistry {
|
|
|
162
162
|
margin: 0 auto;
|
|
163
163
|
padding: .5em 0;
|
|
164
164
|
margin-left: 0;
|
|
165
|
-
overflow: visible;
|
|
165
|
+
overflow-x: visible;
|
|
166
|
+
overflow-y: visible;
|
|
167
|
+
-webkit-overflow-scrolling: touch;
|
|
166
168
|
justify-content: flex-end;
|
|
167
169
|
white-space: nowrap;
|
|
168
170
|
box-shadow: 0 5px 5px -3px rgba(0,0,0,.2), 0 8px 10px 1px rgba(0,0,0,.14), 0 3px 14px 2px rgba(0,0,0,.12);
|
|
169
171
|
z-index: 99999;
|
|
170
172
|
}
|
|
173
|
+
.menubar-menu-container::-webkit-scrollbar {
|
|
174
|
+
width: 8px;
|
|
175
|
+
height: 4px;
|
|
176
|
+
cursor: pointer;
|
|
177
|
+
background-color: rbga(0,0,0,0);
|
|
178
|
+
}
|
|
179
|
+
.menubar-menu-container::-webkit-scrollbar-track {
|
|
180
|
+
border: none;
|
|
181
|
+
background-color: rbga(0,0,0,0);
|
|
182
|
+
}
|
|
183
|
+
.menubar-menu-container::-webkit-scrollbar-thumb{
|
|
184
|
+
border-radius: 10px;
|
|
185
|
+
background-color: rgba(110, 110, 110, 0.2);
|
|
186
|
+
}
|
|
171
187
|
|
|
172
188
|
.menubar-menu-container:focus {
|
|
173
189
|
outline: 0;
|
|
@@ -411,6 +427,10 @@ class Themebar extends ThemingRegistry {
|
|
|
411
427
|
.titlebar .window-controls-container .window-icon-bg.window-close-bg:hover {
|
|
412
428
|
background-color: rgba(232, 17, 35, 0.9)!important;
|
|
413
429
|
}
|
|
430
|
+
|
|
431
|
+
.titlebar .window-controls-container .window-icon-bg.window-close-bg:active {
|
|
432
|
+
background-color: rgba(232, 17, 35, 0.5)!important;
|
|
433
|
+
}
|
|
414
434
|
|
|
415
435
|
.titlebar .window-controls-container .window-icon-bg.inactive {
|
|
416
436
|
background-color: transparent!important;
|
|
@@ -436,9 +456,17 @@ class Themebar extends ThemingRegistry {
|
|
|
436
456
|
background-color: rgba(255, 255, 255, .1);
|
|
437
457
|
}
|
|
438
458
|
|
|
459
|
+
.titlebar .window-controls-container .window-icon-bg:not(.inactive):active {
|
|
460
|
+
background-color: rgba(255, 255, 255, 0.3);
|
|
461
|
+
}
|
|
462
|
+
|
|
439
463
|
.titlebar.light .window-controls-container .window-icon-bg:not(.inactive):hover {
|
|
440
464
|
background-color: rgba(0, 0, 0, .1);
|
|
441
465
|
}
|
|
466
|
+
|
|
467
|
+
.titlebar.light .window-controls-container .window-icon-bg:not(.inactive):active {
|
|
468
|
+
background-color: rgba(0, 0, 0, .2);
|
|
469
|
+
}
|
|
442
470
|
`);
|
|
443
471
|
});
|
|
444
472
|
}
|
|
@@ -537,3 +565,4 @@ function _applyRules(styleSheetContent, rulesClassName) {
|
|
|
537
565
|
themeStyles[0].innerHTML = styleSheetContent;
|
|
538
566
|
}
|
|
539
567
|
}
|
|
568
|
+
//# sourceMappingURL=themebar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"themebar.js","sourceRoot":"","sources":["../src/themebar.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|