From 03c16a39e2f4ed37129a7aa329147f28076c0790 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 27 Mar 2021 11:18:14 -0400 Subject: [PATCH] fix context menu in windows --- src/kiri/init.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 2deeb528..49c2c142 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -2188,7 +2188,8 @@ // block standard browser context menu DOC.oncontextmenu = (event) => { - if (event.target.tagName === 'CANVAS') { + let et = event.target; + if (et.tagName === 'CANVAS' || et.id === 'context-menu') { event.preventDefault(); event.stopPropagation(); return false; @@ -2196,7 +2197,12 @@ }; SPACE.mouse.up((event, int) => { + // context menu if (event.button === 2) { + let et = event.target; + if (et.tagName != 'CANVAS' && et.id != 'context-menu') { + return; + } let full = API.view.isArrange(); for (let key of ["layflat","mirror","duplicate"]) { $(`context-${key}`).disabled = !full; @@ -2236,10 +2242,6 @@ // return selected meshes for further mouse processing return API.feature.hovers || API.selection.meshes(); } - if (event.button === 2 && API.view.isArrange()) { - event.preventDefault(); - event.stopPropagation(); - } }); SPACE.mouse.upSelect(function(object, event) {