mirror of
https://bitbucket.org/wisemapping/wisemapping-frontend.git
synced 2024-11-25 23:54:55 +01:00
Merge branch 'feature/svg_icons' into develop
This commit is contained in:
commit
d2396fcb95
@ -972,9 +972,10 @@ class Topic extends NodeGraph {
|
|||||||
|
|
||||||
const targetParent = targetTopic.getModel().getParent();
|
const targetParent = targetTopic.getModel().getParent();
|
||||||
const sourceParent = sourceTopic.getModel().getParent();
|
const sourceParent = sourceTopic.getModel().getParent();
|
||||||
relationship.setVisibility(value &&
|
relationship.setVisibility(
|
||||||
(targetParent == null || !targetParent.areChildrenShrunken()) &&
|
value
|
||||||
(sourceParent == null || !sourceParent.areChildrenShrunken()),
|
&& (targetParent == null || !targetParent.areChildrenShrunken())
|
||||||
|
&& (sourceParent == null || !sourceParent.areChildrenShrunken()),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -1042,8 +1043,8 @@ class Topic extends NodeGraph {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const oldSize = this.getSize();
|
const oldSize = this.getSize();
|
||||||
const hasSizeChanged = oldSize.width !== roundedSize.width ||
|
const hasSizeChanged = oldSize.width !== roundedSize.width
|
||||||
oldSize.height !== roundedSize.height;
|
|| oldSize.height !== roundedSize.height;
|
||||||
if (hasSizeChanged || force) {
|
if (hasSizeChanged || force) {
|
||||||
NodeGraph.prototype.setSize.call(this, roundedSize);
|
NodeGraph.prototype.setSize.call(this, roundedSize);
|
||||||
|
|
||||||
@ -1340,4 +1341,4 @@ class Topic extends NodeGraph {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default Topic;
|
export default Topic;
|
||||||
|
Loading…
Reference in New Issue
Block a user