diff --git a/dist/locales/en.json b/dist/locales/en.json index e025410b6..0909d2005 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -13012,4 +13012,4 @@ } } } -} +} \ No newline at end of file diff --git a/modules/operations/move.js b/modules/operations/move.js index 800064cf6..f8e7a3ff6 100644 --- a/modules/operations/move.js +++ b/modules/operations/move.js @@ -76,5 +76,7 @@ export function operationMove(context, selectedIDs) { operation.title = t('operations.move.title'); operation.behavior = behaviorOperation(context).which(operation); + operation.mouseOnly = true; + return operation; } diff --git a/modules/operations/rotate.js b/modules/operations/rotate.js index 245945486..574acd99e 100644 --- a/modules/operations/rotate.js +++ b/modules/operations/rotate.js @@ -76,5 +76,7 @@ export function operationRotate(context, selectedIDs) { operation.title = t('operations.rotate.title'); operation.behavior = behaviorOperation(context).which(operation); + operation.mouseOnly = true; + return operation; } diff --git a/modules/ui/edit_menu.js b/modules/ui/edit_menu.js index b4d784879..c5a95f0cc 100644 --- a/modules/ui/edit_menu.js +++ b/modules/ui/edit_menu.js @@ -28,13 +28,18 @@ export function uiEditMenu(context) { var _menuSideMargin = 10; var editMenu = function(selection) { - if (!_operations.length) return; + + var isTouchMenu = _triggerType.includes('touch') || _triggerType.includes('pen'); + + var ops = _operations.filter(function(op) { + return !isTouchMenu || !op.mouseOnly; + }); + + if (!ops.length) return; var offset = [0, 0]; var viewport = context.surfaceRect(); - var isTouchMenu = _triggerType.includes('touch') || _triggerType.includes('pen'); - // Position the menu above the anchor for stylus and finger input // since the mapper's hand likely obscures the screen below the anchor var menuTop = isTouchMenu; @@ -48,7 +53,7 @@ export function uiEditMenu(context) { offset[0] = menuLeft ? -1 * (_menuSideMargin + menuWidth) : _menuSideMargin; - var menuHeight = _verticalPadding * 2 + _operations.length * buttonHeight; + var menuHeight = _verticalPadding * 2 + ops.length * buttonHeight; if (menuTop) { @@ -78,7 +83,7 @@ export function uiEditMenu(context) { .style('top', origin[1] + 'px'); var buttons = _menu.selectAll('.edit-menu-item') - .data(_operations); + .data(ops); // enter var buttonsEnter = buttons.enter()