Skip to content

Commit 99677ea

Browse files
committed
Rearrange invalidation codes for node connections.
1 parent 540645a commit 99677ea

1 file changed

Lines changed: 24 additions & 16 deletions

File tree

Sources/NodeUIEngine/NUIE_NodeUIManager.cpp

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -280,66 +280,74 @@ bool NodeUIManager::CanConnectOutputSlotToInputSlots (const UIOutputSlotConstPtr
280280
bool NodeUIManager::ConnectOutputSlotToInputSlot (const UIOutputSlotConstPtr& outputSlot, const UIInputSlotConstPtr& inputSlot)
281281
{
282282
DBGASSERT (CanConnectOutputSlotToInputSlot (outputSlot, inputSlot));
283-
RequestRecalculateAndRedraw ();
283+
bool success = nodeManager.ConnectOutputSlotToInputSlot (outputSlot, inputSlot);
284284
InvalidateNodeDrawing (inputSlot->GetOwnerNodeId ());
285-
return nodeManager.ConnectOutputSlotToInputSlot (outputSlot, inputSlot);
285+
RequestRecalculateAndRedraw ();
286+
return success;
286287
}
287288

288289
bool NodeUIManager::ConnectOutputSlotsToInputSlot (const UIOutputSlotList& outputSlots, const UIInputSlotConstPtr& inputSlot)
289290
{
290291
DBGASSERT (CanConnectOutputSlotsToInputSlot (outputSlots, inputSlot));
291-
RequestRecalculateAndRedraw ();
292+
bool success = nodeManager.ConnectOutputSlotsToInputSlot (outputSlots, inputSlot);
292293
InvalidateNodeDrawing (inputSlot->GetOwnerNodeId ());
293-
return nodeManager.ConnectOutputSlotsToInputSlot (outputSlots, inputSlot);
294+
RequestRecalculateAndRedraw ();
295+
return success;
294296
}
295297

296298
bool NodeUIManager::ConnectOutputSlotToInputSlots (const UIOutputSlotConstPtr& outputSlot, const UIInputSlotList& inputSlots)
297299
{
298300
DBGASSERT (CanConnectOutputSlotToInputSlots (outputSlot, inputSlots));
299-
RequestRecalculateAndRedraw ();
301+
bool success = nodeManager.ConnectOutputSlotToInputSlots (outputSlot, inputSlots);
300302
inputSlots.Enumerate ([&] (const NE::InputSlotConstPtr& inputSlot) {
301303
InvalidateNodeDrawing (inputSlot->GetOwnerNodeId ());
302304
return true;
303305
});
304-
return nodeManager.ConnectOutputSlotToInputSlots (outputSlot, inputSlots);
306+
RequestRecalculateAndRedraw ();
307+
return success;
305308
}
306309

307310
bool NodeUIManager::DisconnectOutputSlotFromInputSlot (const UIOutputSlotConstPtr& outputSlot, const UIInputSlotConstPtr& inputSlot)
308311
{
309-
RequestRecalculateAndRedraw ();
312+
bool success = nodeManager.DisconnectOutputSlotFromInputSlot (outputSlot, inputSlot);
310313
InvalidateNodeDrawing (inputSlot->GetOwnerNodeId ());
311-
return nodeManager.DisconnectOutputSlotFromInputSlot (outputSlot, inputSlot);
314+
RequestRecalculateAndRedraw ();
315+
return success;
312316
}
313317

314318
bool NodeUIManager::DisconnectOutputSlotsFromInputSlot (const UIOutputSlotList& outputSlots, const UIInputSlotConstPtr& inputSlot)
315319
{
316-
RequestRecalculateAndRedraw ();
320+
bool success = nodeManager.DisconnectOutputSlotsFromInputSlot (outputSlots, inputSlot);
317321
InvalidateNodeDrawing (inputSlot->GetOwnerNodeId ());
318-
return nodeManager.DisconnectOutputSlotsFromInputSlot (outputSlots, inputSlot);
322+
RequestRecalculateAndRedraw ();
323+
return success;
319324
}
320325

321326
bool NodeUIManager::DisconnectOutputSlotFromInputSlots (const UIOutputSlotConstPtr& outputSlot, const UIInputSlotList& inputSlots)
322327
{
323-
RequestRecalculateAndRedraw ();
328+
bool success = nodeManager.DisconnectOutputSlotFromInputSlots (outputSlot, inputSlots);
324329
inputSlots.Enumerate ([&] (const NE::InputSlotConstPtr& inputSlot) {
325330
InvalidateNodeDrawing (inputSlot->GetOwnerNodeId ());
326331
return true;
327332
});
328-
return nodeManager.DisconnectOutputSlotFromInputSlots (outputSlot, inputSlots);
333+
RequestRecalculateAndRedraw ();
334+
return success;
329335
}
330336

331337
bool NodeUIManager::DisconnectAllInputSlotsFromOutputSlot (const UIOutputSlotConstPtr& outputSlot)
332338
{
333-
RequestRecalculateAndRedraw ();
339+
bool success = nodeManager.DisconnectAllInputSlotsFromOutputSlot (outputSlot);
334340
InvalidateNodeDrawing (outputSlot->GetOwnerNodeId ());
335-
return nodeManager.DisconnectAllInputSlotsFromOutputSlot (outputSlot);
341+
RequestRecalculateAndRedraw ();
342+
return success;
336343
}
337344

338345
bool NodeUIManager::DisconnectAllOutputSlotsFromInputSlot (const UIInputSlotConstPtr& inputSlot)
339346
{
340-
RequestRecalculateAndRedraw ();
347+
bool success = nodeManager.DisconnectAllOutputSlotsFromInputSlot (inputSlot);
341348
InvalidateNodeDrawing (inputSlot->GetOwnerNodeId ());
342-
return nodeManager.DisconnectAllOutputSlotsFromInputSlot (inputSlot);
349+
RequestRecalculateAndRedraw ();
350+
return success;
343351
}
344352

345353
bool NodeUIManager::HasConnectedInputSlots (const UIOutputSlotConstPtr& outputSlot) const

0 commit comments

Comments
 (0)