leif/lexys-labyrinth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use cmd on macOS

Browse Source
This commit is contained in:
Simon Lydell 2024-04-28 15:10:35 +02:00
parent d9c6a3b0e0
commit 166adac8de
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/editor/keyboard.js Normal file
View File

@ -0,0 +1,6 @@
export const isMac = /mac|iPhone|iPad|iPod/i.test(window.navigator.platform);
// On macOS it’s more natural to use the Command key for shortcuts.
export function isCtrlKey(event) {
return isMac ? event.metaKey : event.ctrlKey;
}

30
js/editor/main.js
View File

@ -14,6 +14,7 @@ import * as util from '../util.js';
import * as dialogs from './dialogs.js'; import * as dialogs from './dialogs.js';
import { TOOLS, TOOL_ORDER, TOOL_SHORTCUTS, PALETTE, SPECIAL_PALETTE_ENTRIES, SPECIAL_TILE_BEHAVIOR, TILE_DESCRIPTIONS, transform_direction_bitmask } from './editordefs.js'; import { TOOLS, TOOL_ORDER, TOOL_SHORTCUTS, PALETTE, SPECIAL_PALETTE_ENTRIES, SPECIAL_TILE_BEHAVIOR, TILE_DESCRIPTIONS, transform_direction_bitmask } from './editordefs.js';
import { SVGConnection, Selection } from './helpers.js'; import { SVGConnection, Selection } from './helpers.js';
import { isCtrlKey, isMac } from './keyboard.js';
import * as mouseops from './mouseops.js'; import * as mouseops from './mouseops.js';
import { TILES_WITH_PROPS } from './tile-overlays.js'; import { TILES_WITH_PROPS } from './tile-overlays.js';
@ -147,8 +148,23 @@ export class Editor extends PrimaryView {
if (! this.active) if (! this.active)
return; return;
if (ev.ctrlKey) { if (isCtrlKey(ev)) {
if (ev.key === 'a') { // macOS is really weird:
//
// | Keys pressed | `ev.key` |
// |--------------|----------|
// | A | "a" |
// | shift+A | "A" |
// | cmd+A | "a" |
// | cmd+shift+A | "a" !!! |
// | ctrl+shift+A | "A" |
//
// For some reason, with cmd the key is always lowercase.
// So we have to check the letter key case insensitively,
// and then manually check if shift is pressed.
const key = ev.key.toLowerCase();
if (key === 'a' && !ev.shiftKey) {
// Select all // Select all
if (TOOLS[this.current_tool].affects_selection) { if (TOOLS[this.current_tool].affects_selection) {
// If we're in the middle of using a selection tool, cancel it // If we're in the middle of using a selection tool, cancel it
@ -161,7 +177,7 @@ export class Editor extends PrimaryView {
this.commit_undo(); this.commit_undo();
} }
} }
else if (ev.key === 'A') { else if (ev.key === 'a' && ev.shiftKey) {
// Deselect // Deselect
if (TOOLS[this.current_tool].affects_selection) { if (TOOLS[this.current_tool].affects_selection) {
// If we're in the middle of using a selection tool, cancel it // If we're in the middle of using a selection tool, cancel it
@ -173,10 +189,10 @@ export class Editor extends PrimaryView {
this.commit_undo(); this.commit_undo();
} }
} }
else if (ev.key === 'z') { else if (key === 'z' && !ev.shiftKey) {
this.undo(); this.undo();
} }
else if (ev.key === 'Z' || ev.key === 'y') { else if ((key === 'z' && ev.shiftKey) || (key === 'y' && !ev.shiftKey)) {
this.redo(); this.redo();
} }
else { else {
@ -317,7 +333,7 @@ export class Editor extends PrimaryView {
// Mouse wheel to zoom // Mouse wheel to zoom
this.set_canvas_zoom(1); this.set_canvas_zoom(1);
this.viewport_el.addEventListener('wheel', ev => { this.viewport_el.addEventListener('wheel', ev => {
if (!ev.ctrlKey) if (!isCtrlKey(ev))
return; return;
// The delta is platform and hardware dependent and ultimately kind of useless, so just // The delta is platform and hardware dependent and ultimately kind of useless, so just
// treat each event as a click and hope for the best // treat each event as a click and hope for the best
@ -410,7 +426,7 @@ export class Editor extends PrimaryView {
tooltip.append(this.svg_icon('svg-icon-mouse2')); tooltip.append(this.svg_icon('svg-icon-mouse2'));
} }
else if (key) { else if (key) {
tooltip.append(mk('kbd', key)); tooltip.append(mk('kbd', key === 'ctrl' && isMac ? 'cmd' : key));
} }
} }

3
js/editor/mouseops.js
View File

@ -8,6 +8,7 @@ import { mk, mk_svg, walk_grid } from '../util.js';
import { SPECIAL_TILE_BEHAVIOR } from './editordefs.js'; import { SPECIAL_TILE_BEHAVIOR } from './editordefs.js';
import { SVGConnection } from './helpers.js'; import { SVGConnection } from './helpers.js';
import { isCtrlKey } from './keyboard.js';
import { TILES_WITH_PROPS } from './tile-overlays.js'; import { TILES_WITH_PROPS } from './tile-overlays.js';
// TODO some minor grievances // TODO some minor grievances
@ -202,7 +203,7 @@ export class MouseOperation {
} }
_update_modifiers(ev) { _update_modifiers(ev) {
this.ctrl = ev.ctrlKey; this.ctrl = isCtrlKey(ev);
this.shift = ev.shiftKey; this.shift = ev.shiftKey;
this.alt = ev.altKey; this.alt = ev.altKey;
} }