lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-10-15 12:34:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed mousemove bug for overlapped shapes in different groups

Browse Source
This commit is contained in:
Eric Rowell
2012-03-17 19:48:54 -07:00
parent 9e28a9010a
commit 9a61e149df
5 changed files with 155 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/Stage.js
View File

@@ -337,36 +337,20 @@ Kinetic.Stage.prototype = {
return true;
}
// handle touchmove
else if(!isDragging && el.touchmove) {
shape._handleEvents('touchmove', evt);
return true;
}
//this condition is used to identify a new target shape.
else if(!isDragging && (!this.targetShape || (!this.targetFound && shape.id !== this.targetShape.id))) {
/*
* check if old target has an onmouseout event listener
*/
if(this.targetShape) {
var oldEl = this.targetShape.eventListeners;
if(oldEl) {
this.targetShape._handleEvents('onmouseout', evt);
}
}
// set new target shape
this.targetShape = shape;
this.targetFound = true;
/*
* NOTE: these event handlers require target shape
* handling
*/
else if(!isDragging && this._isNewTarget(shape, evt)) {
// handle onmouseover
shape._handleEvents('onmouseover', evt);
return true;
}
// handle onmousemove
// handle mousemove and touchmove
else if(!isDragging) {
shape._handleEvents('onmousemove', evt);
shape._handleEvents('touchmove', evt);
return true;
}
}
@@ -379,6 +363,28 @@ Kinetic.Stage.prototype = {
return false;
},
_isNewTarget: function(shape, evt) {
if(!this.targetShape || (!this.targetFound && shape.id !== this.targetShape.id)) {
/*
* check if old target has an onmouseout event listener
*/
if(this.targetShape) {
var oldEl = this.targetShape.eventListeners;
if(oldEl) {
this.targetShape._handleEvents('onmouseout', evt);
}
}
// set new target shape
this.targetShape = shape;
this.targetFound = true;
return true;
}
else {
return false;
}
},
/**
* traverse container children
* @param {Container} obj
@@ -395,7 +401,10 @@ Kinetic.Stage.prototype = {
}
}
else {
this._traverseChildren(child, evt);
var exit = this._traverseChildren(child, evt);
if(exit) {
return true;
}
}
}

2
src/shapes/Text.js
View File

@@ -34,7 +34,7 @@ Kinetic.Text = function(config) {
context.font = this.fontSize + 'pt ' + this.fontFamily;
context.textBaseline = 'middle';
var metrics = context.measureText(this.text);
var textHeight = this.fontSize;
var textHeight = textHeight = parseInt(this.fontSize, 10);
var textWidth = metrics.width;
var p = this.padding;
var x = 0;