vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-25 23:44:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Integrate free positioning predict on drag.

Browse Source
This commit is contained in:
Paulo Veiga 2012-01-21 10:57:15 -03:00
parent d8e05d7ce0
commit b9638b4c99
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mindplot/src/main/javascript/Designer.js
View File

@ -137,8 +137,7 @@ mindplot.Designer = new Class({
if (!dragTopic.isVisible() && dragTopic.isConnected()) { if (!dragTopic.isVisible() && dragTopic.isConnected()) {
dragTopic.setVisibility(true); dragTopic.setVisibility(true);
} }
}
}
}); });
dragger.addEvent('enddragging', function(event, dragTopic) { dragger.addEvent('enddragging', function(event, dragTopic) {

23
mindplot/src/main/javascript/DragTopic.js
View File

@ -34,26 +34,31 @@ mindplot.DragTopic = new Class({
}, },
setPosition : function(x, y) { setPosition : function(x, y) {
this._position.setValue(x, y); // Update drag shadow position ....
var position = {x:x,y:y};
if (this.isFreeLayoutOn() && this.isConnected()) {
var _layoutManager = designer._eventBussDispatcher._layoutManager;
var par = this.getConnectedToTopic();
position = _layoutManager.predict(par.getId(), position, true).position;
}
this._position.setValue(position.x, position.y);
// Elements are positioned in the center. // Elements are positioned in the center.
// All topic element must be positioned based on the innerShape. // All topic element must be positioned based on the innerShape.
var draggedNode = this._draggedNode; var draggedNode = this._draggedNode;
var size = draggedNode.getSize(); var size = draggedNode.getSize();
var cx = Math.ceil(position.x - (size.width / 2));
var cx = Math.ceil(x - (size.width / 2)); var cy = Math.ceil(position.y - (size.height / 2));
var cy = Math.ceil(y - (size.height / 2));
// Update visual position.
this._elem2d.setPosition(cx, cy); this._elem2d.setPosition(cx, cy);
// In case is not free, pivot must be draw ...
if (this.isConnected() && !this.isFreeLayoutOn()) { if (this.isConnected() && !this.isFreeLayoutOn()) {
var parent = this.getConnectedToTopic(); var parent = this.getConnectedToTopic();
var predict = designer._eventBussDispatcher._layoutManager.predict(parent.getId(), this.getPosition()); var predict = designer._eventBussDispatcher._layoutManager.predict(parent.getId(), this.getPosition());
if (this._order != predict.order) { if (this._order != predict.order) {
var dragPivot = this._getDragPivot(); var dragPivot = this._getDragPivot();
var position = predict.position; var pivotPosition = predict.position;
dragPivot.connectTo(parent, position); dragPivot.connectTo(parent, pivotPosition);
this.setOrder(predict.order); this.setOrder(predict.order);
} }
} }
@ -141,7 +146,7 @@ mindplot.DragTopic = new Class({
}, },
isInWorkspace: function(){ isInWorkspace: function() {
return this._isInWorkspace; return this._isInWorkspace;
}, },