birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clang 13 compilation problems (#5791)

Browse Source 
* Fix clang 13 compilation problems

Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda
which replaces missing `Draw2dLabel` functionality ( added TODO marker
there )

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* apply review suggestions

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix type in assert message

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-11-25 10:24:39 +01:00
committed by GitHub
parent 0883921eb3
commit eca2e36687
48 changed files with 180 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp
+5 -7
View File
@@ -276,6 +276,11 @@ namespace GraphCanvas
m_subTitleWidget->SetLabel(subtitle);
updateLayout = true;
}
if (updateLayout)
{
UpdateLayout();
}
}
void GeneralNodeTitleGraphicsWidget::SetTitle(const AZStd::string& title)
@@ -463,13 +468,6 @@ namespace GraphCanvas
{
GRAPH_CANVAS_DETAILED_PROFILE_FUNCTION();
Styling::PaletteStyle style = m_styleHelper.GetAttribute(Styling::Attribute::PaletteStyle, Styling::PaletteStyle::Solid);
if (m_paletteOverride)
{
style = m_paletteOverride->GetAttribute(Styling::Attribute::PaletteStyle, Styling::PaletteStyle::Solid);
}
// Background
QRectF bounds = boundingRect();
Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp
+3 -5
View File
@@ -188,9 +188,7 @@ namespace GraphCanvas
void GeneralSlotLayoutGraphicsWidget::LinearSlotGroupWidget::DisplaySlot(const AZ::EntityId& slotId)
{
ConnectionType connectionType = ConnectionType::CT_Invalid;
SlotRequestBus::EventResult(connectionType, slotId, &SlotRequests::GetConnectionType);
int layoutOrder = 0;
SlotRequestBus::EventResult(connectionType, slotId, &SlotRequests::GetConnectionType);
SlotLayoutInfo slotInfo(slotId);
@@ -199,14 +197,14 @@ namespace GraphCanvas
SlotUINotificationBus::MultiHandler::BusConnect(slotId);
m_inputSlotSet.insert(slotId);
layoutOrder = LayoutSlot(m_inputs, m_inputSlots, slotInfo);
LayoutSlot(m_inputs, m_inputSlots, slotInfo);
}
else if (connectionType == CT_Output)
{
SlotUINotificationBus::MultiHandler::BusConnect(slotId);
m_outputSlotSet.insert(slotId);
LayoutSlot(m_outputs, m_outputSlots, slotInfo);
LayoutSlot(m_outputs, m_outputSlots, slotInfo);
}
else
{