mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-05 07:03:24 +01:00
fixing lines and adding childs when shrinked children
This commit is contained in:
parent
b678344991
commit
bb6c9702e2
@ -86,7 +86,7 @@ mindplot.ConnectionLine.prototype._createLine = function(lineType, defaultStyle)
|
|||||||
|
|
||||||
mindplot.ConnectionLine.getStrokeColor = function()
|
mindplot.ConnectionLine.getStrokeColor = function()
|
||||||
{
|
{
|
||||||
return '#c8e794';
|
return '#495879';
|
||||||
};
|
};
|
||||||
|
|
||||||
mindplot.ConnectionLine.prototype.setVisibility = function(value)
|
mindplot.ConnectionLine.prototype.setVisibility = function(value)
|
||||||
|
@ -2,7 +2,7 @@ mindplot.EditorOptions =
|
|||||||
{
|
{
|
||||||
// LayoutManager:"OriginalLayout"
|
// LayoutManager:"OriginalLayout"
|
||||||
LayoutManager:"FreeMindLayout",
|
LayoutManager:"FreeMindLayout",
|
||||||
// textEditor:"TextEditor"
|
textEditor:"TextEditor"
|
||||||
textEditor:"RichTextEditor"
|
// textEditor:"RichTextEditor"
|
||||||
|
|
||||||
};
|
};
|
@ -189,7 +189,7 @@ mindplot.Topic.prototype.buildShape = function(attributes, type)
|
|||||||
}
|
}
|
||||||
else if (type == mindplot.NodeModel.SHAPE_TYPE_LINE)
|
else if (type == mindplot.NodeModel.SHAPE_TYPE_LINE)
|
||||||
{
|
{
|
||||||
result = new web2d.Line({strokeColor:"#c8e794",strokeWidth:1, strokeOpacity:1});
|
result = new web2d.Line({strokeColor:"#495879",strokeWidth:1, strokeOpacity:1});
|
||||||
result.setSize = function(width, height)
|
result.setSize = function(width, height)
|
||||||
{
|
{
|
||||||
this.size = {width:width, height:height};
|
this.size = {width:width, height:height};
|
||||||
|
@ -485,7 +485,7 @@ mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayo
|
|||||||
pos.y = Math.round(pos.y);
|
pos.y = Math.round(pos.y);
|
||||||
var nodePos = this.getPosition();
|
var nodePos = this.getPosition();
|
||||||
//if it is on the child half side, or it is central topic add it as child
|
//if it is on the child half side, or it is central topic add it as child
|
||||||
if(layoutManager._isCentralTopic(this) || this.getParent()==null || ((Math.sign(nodePos.x)>0 && pos.x>nodePos.x) || (Math.sign(nodePos.x)<0 && pos.x<nodePos.x))){
|
if(!this.areChildrenShrinked() && (layoutManager._isCentralTopic(this) || this.getParent()==null || ((Math.sign(nodePos.x)>0 && pos.x>nodePos.x) || (Math.sign(nodePos.x)<0 && pos.x<nodePos.x)))){
|
||||||
layoutManager._updateIndicatorShapes(this, mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_CHILD, pos);
|
layoutManager._updateIndicatorShapes(this, mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_CHILD, pos);
|
||||||
}else{
|
}else{
|
||||||
//is a sibling. if mouse in top half sibling goes above this one
|
//is a sibling. if mouse in top half sibling goes above this one
|
||||||
|
@ -20,7 +20,7 @@ web2d.peer.svg.CurvedLinePeer = function()
|
|||||||
{
|
{
|
||||||
var svgElement = window.document.createElementNS(this.svgNamespace, 'path');
|
var svgElement = window.document.createElementNS(this.svgNamespace, 'path');
|
||||||
web2d.peer.svg.ElementPeer.call(this, svgElement);
|
web2d.peer.svg.ElementPeer.call(this, svgElement);
|
||||||
this._style={fill:'#c8e794'};
|
this._style={fill:'#495879'};
|
||||||
this._updateStyle();
|
this._updateStyle();
|
||||||
this._customControlPoint_1 = false;
|
this._customControlPoint_1 = false;
|
||||||
this._customControlPoint_2 = false;
|
this._customControlPoint_2 = false;
|
||||||
|
@ -403,7 +403,7 @@ var nicEditor = bkClass.extend({
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} while(t = t.parentNode);
|
} while(t = t.parentNode);
|
||||||
this.fireEvent('blur',this.<selectedInstance,t);
|
this.fireEvent('blur',this.selectedInstance,t);
|
||||||
this.lastSelectedInstance = this.selectedInstance;
|
this.lastSelectedInstance = this.selectedInstance;
|
||||||
this.selectedInstance = null;
|
this.selectedInstance = null;
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user