AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix context menu in windows

Browse source
This commit is contained in:
Stewart Allen 2021-03-27 11:18:14 -04:00
commit 03c16a39e2
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/kiri/init.js
View file

@ -2188,7 +2188,8 @@
// block standard browser context menu // block standard browser context menu
DOC.oncontextmenu = (event) => { DOC.oncontextmenu = (event) => {
if (event.target.tagName === 'CANVAS') { let et = event.target;
if (et.tagName === 'CANVAS' || et.id === 'context-menu') {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
return false; return false;
@ -2196,7 +2197,12 @@
}; };
SPACE.mouse.up((event, int) => { SPACE.mouse.up((event, int) => {
// context menu
if (event.button === 2) { if (event.button === 2) {
let et = event.target;
if (et.tagName != 'CANVAS' && et.id != 'context-menu') {
return;
}
let full = API.view.isArrange(); let full = API.view.isArrange();
for (let key of ["layflat","mirror","duplicate"]) { for (let key of ["layflat","mirror","duplicate"]) {
$(`context-${key}`).disabled = !full; $(`context-${key}`).disabled = !full;
@ -2236,10 +2242,6 @@
// return selected meshes for further mouse processing // return selected meshes for further mouse processing
return API.feature.hovers || API.selection.meshes(); return API.feature.hovers || API.selection.meshes();
} }
if (event.button === 2 && API.view.isArrange()) {
event.preventDefault();
event.stopPropagation();
}
}); });
SPACE.mouse.upSelect(function(object, event) { SPACE.mouse.upSelect(function(object, event) {