scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use wasDragged flag to selectively activate 'when this sprite clicked' block on mouse up.

Browse source
This commit is contained in:
Karishma Chadha 2018-02-28 16:45:26 -05:00
parent 1f3c6ac6ad
commit d51a2ad39f
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/io/mouse.js
View file

@ -17,17 +17,23 @@ class Mouse {
* Activate "event_whenthisspriteclicked" hats if needed. * Activate "event_whenthisspriteclicked" hats if needed.
* @param {number} x X position to be sent to the renderer. * @param {number} x X position to be sent to the renderer.
* @param {number} y Y position to be sent to the renderer. * @param {number} y Y position to be sent to the renderer.
* @param {?bool} wasDragged Whether the click event was the result of
* a drag end.
* @private * @private
*/ */
_activateClickHats (x, y) { _activateClickHats (x, y, wasDragged) {
if (this.runtime.renderer) { if (this.runtime.renderer) {
const drawableID = this.runtime.renderer.pick(x, y); const drawableID = this.runtime.renderer.pick(x, y);
for (let i = 0; i < this.runtime.targets.length; i++) { for (let i = 0; i < this.runtime.targets.length; i++) {
const target = this.runtime.targets[i]; const target = this.runtime.targets[i];
if (target.hasOwnProperty('drawableID') && if (target.hasOwnProperty('drawableID') &&
target.drawableID === drawableID) { target.drawableID === drawableID) {
this.runtime.startHats('event_whenthisspriteclicked', // only activate click hat if the mouse up event wasn't
null, target); // the result of a drag ending
if (!wasDragged) {
this.runtime.startHats('event_whenthisspriteclicked',
null, target);
}
return; return;
} }
} }
@ -58,7 +64,7 @@ class Mouse {
if (typeof data.isDown !== 'undefined') { if (typeof data.isDown !== 'undefined') {
this._isDown = data.isDown; this._isDown = data.isDown;
if (!this._isDown) { if (!this._isDown) {
this._activateClickHats(data.x, data.y); this._activateClickHats(data.x, data.y, data.wasDragged);
} }
} }
} }