Integrating github/staging through commit ab87ed9
This commit is contained in:
@@ -101,7 +101,6 @@ namespace GraphCanvas
|
||||
}
|
||||
|
||||
float scaledZoomLevel = 1.0f;
|
||||
float zoomPercent = 0.0f;
|
||||
|
||||
if (zoomLevel > 0.0f)
|
||||
{
|
||||
|
||||
@@ -1036,7 +1036,6 @@ namespace GraphCanvas
|
||||
}
|
||||
|
||||
QString candidate = QString::fromUtf8(rawSelector->GetString());
|
||||
bool br = candidate == "slot";
|
||||
|
||||
if (candidate.contains(invalidStart))
|
||||
{
|
||||
|
||||
@@ -199,13 +199,14 @@ namespace
|
||||
size_t processed = 0;
|
||||
size_t read = 0;
|
||||
char* data = buffer.data();
|
||||
while (processed < length && (read = in.Read(length - processed, data + processed)))
|
||||
while (processed < length)
|
||||
{
|
||||
processed += read;
|
||||
if (read == 0)
|
||||
read = in.Read(length - processed, data + processed);
|
||||
if (!read)
|
||||
{
|
||||
break;
|
||||
}
|
||||
processed += read;
|
||||
}
|
||||
|
||||
AZ_Assert(processed == length, "Incorrect amount of data read from stream");
|
||||
|
||||
@@ -611,7 +611,6 @@ namespace GraphCanvas
|
||||
QPainterPath path;
|
||||
|
||||
qreal borderWidth = iconStyleHelper->GetAttribute(Styling::Attribute::BorderWidth, 1.0);
|
||||
qreal borderRadius = iconStyleHelper->GetAttribute(Styling::Attribute::BorderRadius, 1.0);
|
||||
|
||||
QRectF rect(margin, margin, width, height);
|
||||
QRectF adjusted = rect.marginsRemoved(QMarginsF(borderWidth / 2.0, borderWidth / 2.0, borderWidth / 2.0, borderWidth / 2.0));
|
||||
|
||||
@@ -178,7 +178,7 @@ namespace GraphCanvas
|
||||
|
||||
if (inserted)
|
||||
{
|
||||
size_t removedCount = m_finalizedElements.erase(helper);
|
||||
[[maybe_unused]] size_t removedCount = m_finalizedElements.erase(helper);
|
||||
AZ_Error("GraphCanvas", removedCount == 0, "Inciting an element after it has already been finalized.");
|
||||
|
||||
m_triggeredNodes.insert(helper->GetOrderingStruct());
|
||||
@@ -2154,8 +2154,6 @@ namespace GraphCanvas
|
||||
{
|
||||
ScopedGraphUndoBlocker undoBlocker(graphId);
|
||||
|
||||
SceneRequests* sceneRequests = SceneRequestBus::FindFirstHandler(graphId);
|
||||
|
||||
// We want to align everything to the average position to try to minimize the amount of motion required to do the alignment
|
||||
for (const NodeOrderingStruct& nodeStruct : nodeOrdering)
|
||||
{
|
||||
@@ -2450,8 +2448,6 @@ namespace GraphCanvas
|
||||
AZStd::vector< SlotId > slotIds;
|
||||
NodeRequestBus::EventResult(slotIds, entryId, &NodeRequests::GetSlotIds);
|
||||
|
||||
bool incitedElements = false;
|
||||
|
||||
// Find each of the connections that will be triggered by the current node
|
||||
for (SlotId slotId : slotIds)
|
||||
{
|
||||
@@ -3025,9 +3021,6 @@ namespace GraphCanvas
|
||||
|
||||
if (itemInterface)
|
||||
{
|
||||
bool isDisabled = false;
|
||||
bool stateChanged = false;
|
||||
|
||||
if (enabledState == RootGraphicsItemEnabledState::ES_Enabled)
|
||||
{
|
||||
itemInterface->SetEnabledState(enabledState);
|
||||
@@ -3557,8 +3550,6 @@ namespace GraphCanvas
|
||||
exploredNodes.erase(nodeId);
|
||||
}
|
||||
|
||||
bool nodeDisabled = enabledState != RootGraphicsItemEnabledState::ES_Enabled;
|
||||
|
||||
AZStd::vector< SlotId > nodeSlots;
|
||||
NodeRequestBus::EventResult(nodeSlots, nodeId, &NodeRequests::GetSlotIds);
|
||||
|
||||
@@ -3580,8 +3571,6 @@ namespace GraphCanvas
|
||||
RootGraphicsItemEnabledState connectionState = RootGraphicsItemEnabledState::ES_Enabled;
|
||||
RootGraphicsItemRequestBus::EventResult(connectionState, connectionId, &RootGraphicsItemRequests::GetEnabledState);
|
||||
|
||||
bool connectionEnabled = connectionState != RootGraphicsItemEnabledState::ES_Enabled;
|
||||
|
||||
if (enabledState != connectionState)
|
||||
{
|
||||
Endpoint otherEndpoint;
|
||||
|
||||
@@ -61,8 +61,6 @@ namespace GraphCanvas
|
||||
return 0;
|
||||
}
|
||||
|
||||
int distance = -1;
|
||||
|
||||
// Find the line between the two rectangles.
|
||||
QPointF direction = rectA.center() - rectB.center();
|
||||
QLineF directionLine(rectA.center(), rectB.center());
|
||||
|
||||
-2
@@ -117,8 +117,6 @@ namespace GraphCanvas
|
||||
const GraphId& graphId = GetGraphId();
|
||||
AZ::EntityId groupTarget = GetTargetId();
|
||||
|
||||
SceneReaction reaction = SceneReaction::Nothing;
|
||||
|
||||
if (GraphUtils::UngroupGroup(graphId, groupTarget))
|
||||
{
|
||||
return SceneReaction::PostUndo;
|
||||
|
||||
-5
@@ -65,7 +65,6 @@ namespace GraphCanvas
|
||||
ContextMenuAction::SceneReaction RemoveSlotMenuAction::TriggerAction(const AZ::Vector2& /*scenePos*/)
|
||||
{
|
||||
const AZ::EntityId& targetId = GetTargetId();
|
||||
const GraphId& graphId = GetGraphId();
|
||||
|
||||
if (GraphUtils::IsSlot(targetId))
|
||||
{
|
||||
@@ -119,7 +118,6 @@ namespace GraphCanvas
|
||||
bool enableAction = false;
|
||||
|
||||
const AZ::EntityId& targetId = GetTargetId();
|
||||
const GraphId& graphId = GetGraphId();
|
||||
|
||||
if (GraphUtils::IsSlot(targetId))
|
||||
{
|
||||
@@ -132,7 +130,6 @@ namespace GraphCanvas
|
||||
ContextMenuAction::SceneReaction ClearConnectionsMenuAction::TriggerAction(const AZ::Vector2& /*scenePos*/)
|
||||
{
|
||||
const AZ::EntityId& targetId = GetTargetId();
|
||||
const GraphId& graphId = GetGraphId();
|
||||
|
||||
if (GraphUtils::IsSlot(targetId))
|
||||
{
|
||||
@@ -249,7 +246,6 @@ namespace GraphCanvas
|
||||
void ToggleReferenceStateAction::RefreshAction()
|
||||
{
|
||||
const AZ::EntityId& targetId = GetTargetId();
|
||||
const GraphId& graphId = GetGraphId();
|
||||
|
||||
if (GraphUtils::IsSlot(targetId))
|
||||
{
|
||||
@@ -293,7 +289,6 @@ namespace GraphCanvas
|
||||
bool toggledState = false;
|
||||
|
||||
const AZ::EntityId& targetId = GetTargetId();
|
||||
const GraphId& graphId = GetGraphId();
|
||||
|
||||
DataSlotType dataSlotType = DataSlotType::Unknown;
|
||||
DataSlotRequestBus::EventResult(dataSlotType, targetId, &DataSlotRequests::GetDataSlotType);
|
||||
|
||||
@@ -436,8 +436,6 @@ namespace GraphCanvas
|
||||
|
||||
while (exploreNextIndex)
|
||||
{
|
||||
int rowCount = m_model->rowCount(searchIndex);
|
||||
|
||||
if (nextRow < 0)
|
||||
{
|
||||
// If our parent isn't valid this means we reached the top of our list. So we'll want to reset our next row count.
|
||||
|
||||
Reference in New Issue
Block a user