oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodeview: fixed crash when expanding a NodeViewItem with a NodeInputArray

Browse Source
This commit is contained in:
itsmattkc
2020-02-26 00:47:01 +11:00
parent bf7fc9a0c4
commit 785160b86b
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/nodeview/nodeviewedge.cpp
+4 -4
View File
@@ -56,10 +56,10 @@ NodeEdgePtr NodeViewEdge::edge()
return edge_;
}
qreal CalculateEdgeYPoint(NodeViewItem *item, int param_index, NodeViewItem *opposing)
qreal CalculateEdgeYPoint(NodeViewItem *item, NodeParam* param, NodeViewItem *opposing)
{
if (item->IsExpanded()) {
return item->pos().y() + item->GetParameterConnectorRect(param_index).center().y();
return item->pos().y() + item->GetParameterConnectorRect(param).center().y();
} else {
qreal max_height = qMax(opposing->rect().height(), item->rect().height());
@@ -89,8 +89,8 @@ void NodeViewEdge::Adjust()
QPointF input_point = QPointF(input->pos().x() + output->rect().left(), 0);
// Calculate output/input points
output_point.setY(CalculateEdgeYPoint(output, edge_->output()->index(), input));
input_point.setY(CalculateEdgeYPoint(input, edge_->input()->index(), output));
output_point.setY(CalculateEdgeYPoint(output, edge_->output(), input));
input_point.setY(CalculateEdgeYPoint(input, edge_->input(), output));
// Draw a line between the two
setLine(QLineF(