Made change affect all modifiable containers.
This commit is contained in:
@@ -62,8 +62,6 @@ namespace AZ
|
||||
const static AZ::Crc32 ButtonTooltip = AZ_CRC("ButtonTooltip", 0x1605a7d2);
|
||||
const static AZ::Crc32 CheckboxTooltip = AZ_CRC("CheckboxTooltip", 0x1159eb78);
|
||||
const static AZ::Crc32 CheckboxDefaultValue = AZ_CRC("CheckboxDefaultValue", 0x03f117e6);
|
||||
//! Emboldens the text and adds a line above this item within the RPE.
|
||||
const static AZ::Crc32 RPESectionSeparator = AZ_CRC("RPESectionSeparator", 0xc6249a95);
|
||||
//! Affects the display order of a node relative to it's parent/children. Higher values display further down (after) lower values. Default is 0, negative values are allowed. Must be applied as an attribute to the EditorData element
|
||||
const static AZ::Crc32 DisplayOrder = AZ_CRC("DisplayOrder", 0x23660ec2);
|
||||
//! Specifies whether the UI should support multi-edit for aggregate instances of this property
|
||||
|
||||
+15
-7
@@ -315,8 +315,6 @@ namespace AzToolsFramework
|
||||
}
|
||||
}
|
||||
|
||||
m_isSectionSeparator = false;
|
||||
|
||||
RefreshAttributesFromNode(true);
|
||||
|
||||
// --------------------- HANDLER discovery:
|
||||
@@ -962,10 +960,6 @@ namespace AzToolsFramework
|
||||
{
|
||||
HandleChangeNotifyAttribute(reader, m_sourceNode ? m_sourceNode->GetParent() : nullptr, m_editingCompleteNotifiers);
|
||||
}
|
||||
else if (attributeName == AZ::Edit::Attributes::RPESectionSeparator)
|
||||
{
|
||||
m_isSectionSeparator = true;
|
||||
}
|
||||
}
|
||||
|
||||
void PropertyRowWidget::SetReadOnlyQueryFunction(const ReadOnlyQueryFunction& readOnlyQueryFunction)
|
||||
@@ -1340,7 +1334,7 @@ namespace AzToolsFramework
|
||||
|
||||
bool PropertyRowWidget::IsSectionSeparator() const
|
||||
{
|
||||
return m_isSectionSeparator;
|
||||
return CanBeReordered();
|
||||
}
|
||||
|
||||
bool PropertyRowWidget::GetAppendDefaultLabelToName()
|
||||
@@ -1686,6 +1680,20 @@ namespace AzToolsFramework
|
||||
m_nameLabel->setFilter(m_currentFilterString);
|
||||
}
|
||||
|
||||
bool PropertyRowWidget::CanChildrenBeReordered() const
|
||||
{
|
||||
return m_containerEditable;
|
||||
}
|
||||
|
||||
bool PropertyRowWidget::CanBeReordered() const
|
||||
{
|
||||
if (!m_parentRow)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return m_parentRow->CanChildrenBeReordered();
|
||||
}
|
||||
}
|
||||
|
||||
#include "UI/PropertyEditor/moc_PropertyRowWidget.cpp"
|
||||
|
||||
+3
-2
@@ -149,6 +149,9 @@ namespace AzToolsFramework
|
||||
QLabel* GetNameLabel() { return m_nameLabel; }
|
||||
void SetIndentSize(int w);
|
||||
void SetAsCustom(bool custom) { m_custom = custom; }
|
||||
|
||||
bool CanChildrenBeReordered() const;
|
||||
bool CanBeReordered() const;
|
||||
protected:
|
||||
int CalculateLabelWidth() const;
|
||||
|
||||
@@ -232,8 +235,6 @@ namespace AzToolsFramework
|
||||
int m_treeIndentation = 14;
|
||||
int m_leafIndentation = 16;
|
||||
|
||||
bool m_isSectionSeparator = false;
|
||||
|
||||
QIcon m_iconOpen;
|
||||
QIcon m_iconClosed;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user