Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-24 21:23:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Closes #40. Objects, boundaries of which are fully contained within boundaries of other objects are now sent to back/forward properly (via canvas.sendBackwards/canvas.bringForward).

Browse source
This commit is contained in:
kangax 2011-07-26 00:20:57 -04:00
parent aa885ee458
commit 29ae6b8f0f
3 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dist/all.js vendored
View file

@ -5563,7 +5563,7 @@ fabric.util.getElementOffset = getElementOffset;
if (idx !== 0) {
for (var i=idx-1; i>=0; --i) {
if (object.intersectsWithObject(this._objects[i])) {
if (object.intersectsWithObject(this._objects[i]) || object.isContainedWithinObject(this._objects[i])) {
nextIntersectingIdx = i;
break;
}
@ -5590,7 +5590,7 @@ fabric.util.getElementOffset = getElementOffset;
if (idx !== objects.length-1) {
for (var i = idx + 1, l = this._objects.length; i < l; ++i) {
if (object.intersectsWithObject(objects[i])) {
if (object.intersectsWithObject(objects[i]) || object.isContainedWithinObject(this._objects[i])) {
nextIntersectingIdx = i;
break;
}
@ -7006,6 +7006,7 @@ fabric.util.object.extend(fabric.Canvas.prototype, {
}
var thisCoords = getCoords(this.oCoords),
otherCoords = getCoords(other.oCoords);
var intersection = fabric.Intersection.intersectPolygonPolygon(
[thisCoords.tl, thisCoords.tr, thisCoords.br, thisCoords.bl],
[otherCoords.tl, otherCoords.tr, otherCoords.br, otherCoords.bl]
@ -7014,6 +7015,16 @@ fabric.util.object.extend(fabric.Canvas.prototype, {
return (intersection.status === 'Intersection');
},
/**
* Returns true if object is fully contained within area of another object
* @method isContainedWithinObject
* @param {Object} other Object to test
* @return {Boolean}
*/
isContainedWithinObject: function(other) {
return this.isContainedWithinRect(other.oCoords.tl, other.oCoords.br);
},
/**
* Returns true if object is fully contained within area formed by 2 points
* @method isContainedWithinRect
@ -7027,6 +7038,7 @@ fabric.util.object.extend(fabric.Canvas.prototype, {
tr = new fabric.Point(oCoords.tr.x, oCoords.tr.y),
bl = new fabric.Point(oCoords.bl.x, oCoords.bl.y),
br = new fabric.Point(oCoords.br.x, oCoords.br.y);
return tl.x > selectionTL.x
&& tr.x < selectionBR.x
&& tl.y > selectionTL.y
@ -9838,7 +9850,7 @@ fabric.util.object.extend(fabric.Canvas.prototype, {
* @property
* @type String
*/
fontFamily: 'Modernist_One_400',
fontFamily: 'Times_New_Roman',
/**
* @property

4
src/canvas.class.js
View file

@ -1715,7 +1715,7 @@
// traverse down the stack looking for the nearest intersecting object
for (var i=idx-1; i>=0; --i) {
if (object.intersectsWithObject(this._objects[i])) {
if (object.intersectsWithObject(this._objects[i]) || object.isContainedWithinObject(this._objects[i])) {
nextIntersectingIdx = i;
break;
}
@ -1744,7 +1744,7 @@
// traverse up the stack looking for the nearest intersecting object
for (var i = idx + 1, l = this._objects.length; i < l; ++i) {
if (object.intersectsWithObject(objects[i])) {
if (object.intersectsWithObject(objects[i]) || object.isContainedWithinObject(this._objects[i])) {
nextIntersectingIdx = i;
break;
}

12
src/object.class.js
View file

@ -767,6 +767,7 @@
}
var thisCoords = getCoords(this.oCoords),
otherCoords = getCoords(other.oCoords);
var intersection = fabric.Intersection.intersectPolygonPolygon(
[thisCoords.tl, thisCoords.tr, thisCoords.br, thisCoords.bl],
[otherCoords.tl, otherCoords.tr, otherCoords.br, otherCoords.bl]
@ -775,6 +776,16 @@
return (intersection.status === 'Intersection');
},
/**
* Returns true if object is fully contained within area of another object
* @method isContainedWithinObject
* @param {Object} other Object to test
* @return {Boolean}
*/
isContainedWithinObject: function(other) {
return this.isContainedWithinRect(other.oCoords.tl, other.oCoords.br);
},
/**
* Returns true if object is fully contained within area formed by 2 points
* @method isContainedWithinRect
@ -788,6 +799,7 @@
tr = new fabric.Point(oCoords.tr.x, oCoords.tr.y),
bl = new fabric.Point(oCoords.bl.x, oCoords.bl.y),
br = new fabric.Point(oCoords.br.x, oCoords.br.y);
return tl.x > selectionTL.x
&& tr.x < selectionBR.x
&& tl.y > selectionTL.y