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

Pass raw event information to brushes #5687

Merged
merged 12 commits into from
Jun 6, 2019
Merged

Pass raw event information to brushes #5687

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1d9b502
Add pressure property to fabric.util.getPointer
arcatdmz Mar 22, 2019
cef33cc
eslint fix
arcatdmz Mar 22, 2019
83de1aa
Support Node.js by omitting 'window' reference
arcatdmz Mar 22, 2019
0294ac4
Update dist files
arcatdmz Mar 22, 2019
dbc989f
Add pressure property to getPointer ret value
arcatdmz Mar 23, 2019
6df02f8
Merge branch 'pressure-support'
arcatdmz Mar 23, 2019
9466e52
Update dist files
arcatdmz Mar 23, 2019
88e7788
Merge branch 'master' of https://github.com/fabricjs/fabric.js
arcatdmz May 14, 2019
91c0bb5
Revert dist files (sync with fabricjs/master)
arcatdmz May 14, 2019
b3fff0f
Revert src files (sync with fabricjs/master)
arcatdmz May 14, 2019
bc83982
Pass raw events to BaseBrush.onMouse{Move|Down|Up}
arcatdmz May 14, 2019
70f9f76
Pass { e, pointer } to all brush event handlers
arcatdmz Jun 5, 2019
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
7 changes: 4 additions & 3 deletions src/mixins/canvas_events.mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
fabric.util.clipContext(this, this.contextTop);
}
var pointer = this.getPointer(e);
this.freeDrawingBrush.onMouseDown(pointer);
this.freeDrawingBrush.onMouseDown(pointer, { e: e, pointer: pointer });
this._handleEvent(e, 'down');
},

Expand All @@ -545,7 +545,7 @@
_onMouseMoveInDrawingMode: function(e) {
if (this._isCurrentlyDrawing) {
var pointer = this.getPointer(e);
this.freeDrawingBrush.onMouseMove(pointer);
this.freeDrawingBrush.onMouseMove(pointer, { e: e, pointer: pointer });
}
this.setCursor(this.freeDrawingCursor);
this._handleEvent(e, 'move');
Expand All @@ -560,7 +560,8 @@
if (this.clipTo) {
this.contextTop.restore();
}
this.freeDrawingBrush.onMouseUp();
var pointer = this.getPointer(e);
this.freeDrawingBrush.onMouseUp({ e: e, pointer: pointer });
this._handleEvent(e, 'up');
},

Expand Down