Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Activate tools immediately using last good known mouse event #511

Merged
merged 7 commits into from
Dec 16, 2020
Merged

Activate tools immediately using last good known mouse event #511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59eac8e
feat(global-connect): auto activate with last mouse position
nikku Dec 15, 2020
ec2455e
feat(space-tool): auto activate with last mouse position
nikku Dec 15, 2020
4c721bb
feat(hand-tool): auto activate with last mouse position
nikku Dec 14, 2020
ef51d2c
feat(lasso-tool): auto activate with last mouse position
nikku Dec 15, 2020
5155124
chore(tool-manager): make palette click detection fail safe
nikku Dec 15, 2020
eb015e8
test: cover tool #toggle APIs
nikku Dec 15, 2020
2680b8b
chore(hand-tool): consistently use self in event listeners
nikku Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(space-tool): auto activate with last mouse position 
Related to bpmn-io/bpmn-js#584
  • Loading branch information
@nikku
nikku committed Dec 15, 2020
commit ec2455e5bbbebf26a327566d066d76d52db53d7d
22 changes: 16 additions & 6 deletions lib/features/space-tool/SpaceTool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,21 @@ var PADDING = 20;
* @param {EventBus} eventBus
* @param {Modeling} modeling
* @param {Rules} rules
* @param {toolManager} toolManager
* @param {ToolManager} toolManager
* @param {Mouse} mouse
*/
export default function SpaceTool(canvas, dragging, eventBus, modeling, rules, toolManager) {
export default function SpaceTool(
canvas, dragging, eventBus,
modeling, rules, toolManager,
mouse) {

this._canvas = canvas;
this._dragging = dragging;
this._eventBus = eventBus;
this._modeling = modeling;
this._rules = rules;
this._toolManager = toolManager;
this._mouse = mouse;

var self = this;

Expand Down Expand Up @@ -127,7 +133,8 @@ SpaceTool.$inject = [
'eventBus',
'modeling',
'rules',
'toolManager'
'toolManager',
'mouse'
];

/**
Expand Down Expand Up @@ -285,11 +292,14 @@ SpaceTool.prototype.calculateAdjustments = function(elements, axis, delta, start
};

SpaceTool.prototype.toggle = function() {

if (this.isActive()) {
this._dragging.cancel();
} else {
this.activateSelection();
return this._dragging.cancel();
}

var mouseEvent = this._mouse.getLastMoveEvent();

this.activateSelection(mouseEvent, !!mouseEvent);
};

SpaceTool.prototype.isActive = function() {
Expand Down
4 changes: 3 additions & 1 deletion lib/features/space-tool/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import DraggingModule from '../dragging';
import RulesModule from '../rules';
import ToolManagerModule from '../tool-manager';
import PreviewSupportModule from '../preview-support';
import MouseModule from '../mouse';

import SpaceTool from './SpaceTool';
import SpaceToolPreview from './SpaceToolPreview';
Expand All @@ -12,7 +13,8 @@ export default {
DraggingModule,
RulesModule,
ToolManagerModule,
PreviewSupportModule
PreviewSupportModule,
MouseModule
],
spaceTool: ['type', SpaceTool ],
spaceToolPreview: ['type', SpaceToolPreview ]
Expand Down