Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -31,7 +31,7 @@ namespace GraphCanvas
: public QGraphicsLinearLayout
, public SlotNotificationBus::Handler
, public SceneMemberNotificationBus::Handler
, public StyleNotificationBus::Handler
, public StyleNotificationBus::Handler
{
public:
AZ_CLASS_ALLOCATOR(ExecutionSlotLayout, AZ::SystemAllocator, 0);
@@ -60,6 +60,13 @@ namespace GraphCanvas
private:
// ExecutionSlotLayoutBus
void SetTextDecoration(const AZStd::string& textDecoration, const AZStd::string& toolTip);
void ClearTextDecoration();
////
void ApplyTextStyle(GraphCanvasLabel* graphCanvasLabel);
void UpdateLayout();
void UpdateGeometry();
@@ -70,6 +77,8 @@ namespace GraphCanvas
ExecutionSlotConnectionPin* m_slotConnectionPin;
GraphCanvasLabel* m_slotText;
GraphCanvasLabel* m_textDecoration;
};
//! Lays out the parts of a basic Node
@@ -90,4 +99,4 @@ namespace GraphCanvas
private:
ExecutionSlotLayout* m_layout;
};
}
}