Skip to content

Commit ebb73ca

Browse files
author
Dono
committed
(1) menu: add a shortcut to the inventory in the radial menu
1 parent b281137 commit ebb73ca

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

β€Žapp/client/ui/radial-menu.jsβ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/* eslint-disable no-use-before-define */
22

33
let menuOpenUsingKey = false;
4+
const metaKeyCode = 91;
45
const keyToOpen = 'shift';
56
const keyToOpenDelay = 200;
67
const menuOffset = { x: 0, y: -6 };
78
const horizontalMenuItemDistance = { x: 45, y: -90 };
89
const radialMenuRadius = 72;
10+
const radialMenuOffsetY = 38;
911
const mouseDistanceToCloseMenu = 105;
1012
const itemAmountRequiredForBackground = 2;
1113
let menuHandler;
@@ -46,6 +48,7 @@ const mainMenuItems = [
4648
{ icon: 'πŸ“Ί', shortcut: 51, label: 'Screen', state: 'shareScreen', action: () => toggleUserProperty('shareScreen') },
4749
{ icon: 'πŸŽ₯', shortcut: 50, label: 'Camera', state: 'shareVideo', action: () => toggleUserProperty('shareVideo') },
4850
{ icon: '🎀', shortcut: 49, label: 'Audio', state: 'shareAudio', action: () => toggleUserProperty('shareAudio') },
51+
{ icon: 'πŸ“¦', shortcut: 73, label: 'Inventory', action: () => { toggleModal('inventory'); closeMenu(); } },
4952
{ icon: 'πŸ˜ƒ', shortcut: 57, label: 'Reactions', action: template => buildMenu(reactionMenuItems, template.items) },
5053
{ icon: 'πŸ””', shortcut: 56, label: 'Notifications', action: () => { toggleModal('notifications'); closeMenu(); } },
5154
{ icon: 'πŸ“œ', shortcut: 55, label: 'Quests', action: () => { Session.set('quests', { origin: 'menu' }); closeMenu(); } },
@@ -147,8 +150,7 @@ const onMouseMove = event => {
147150
if (!Session.get('menu') || menuOpenUsingKey) return;
148151
const menuPosition = computeMenuPosition();
149152
const mousePosition = { x: event.clientX, y: event.clientY };
150-
const offsetY = 38;
151-
const distance = Math.sqrt((menuPosition.x - mousePosition.x) ** 2 + ((menuPosition.y - offsetY) - mousePosition.y) ** 2);
153+
const distance = Math.sqrt((menuPosition.x - mousePosition.x) ** 2 + ((menuPosition.y - radialMenuOffsetY) - mousePosition.y) ** 2);
152154
if (distance >= mouseDistanceToCloseMenu) closeMenu();
153155
};
154156

@@ -174,8 +176,6 @@ Template.radialMenu.onCreated(function () {
174176
hotkeys('space', { scope: scopes.player }, () => toggleUserProperty('shareAudio'));
175177

176178
hotkeys('*', { keyup: true, scope: scopes.player }, e => {
177-
const metaKeyCode = 91;
178-
179179
// show/hide shortcuts
180180
if (e.key.toLowerCase() === keyToOpen && !hotkeys.isPressed(metaKeyCode)) {
181181
this.showShortcuts.set(e.type === 'keydown');

0 commit comments

Comments
Β (0)