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

Reverting some unused code

Browse Source
This commit is contained in:
mnaumov
2021-04-26 17:48:49 -07:00
parent 91f027a05c
commit fdcb19f45a
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
-2
View File
@@ -15,8 +15,6 @@
#include "PropertyAssetCtrl.hxx"
#include "PropertyQTConstants.h"
#include "PropertyRowWidget.hxx"
#include "ReflectedPropertyEditor.hxx"
AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option")
#include <QtWidgets/QHBoxLayout>
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx
+1 -1
View File
@@ -178,7 +178,7 @@ namespace AzToolsFramework
void HandleFieldClear();
AZStd::string AddDefaultSuffix(const AZStd::string& filename);
//////////////////////////////////////////////////////////////////////////
// AssetSystemBus
void SourceFileChanged(AZStd::string relativePath, AZStd::string scanFolder, AZ::Uuid sourceUUID) override;
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp
+6 -6
View File
@@ -387,17 +387,17 @@ namespace AzToolsFramework
QString PropertyRowWidget::label() const
{
return m_title;
return m_nameLabel->text();
}
void PropertyRowWidget::SetNameLabel(const char* text)
{
m_title = text;
m_nameLabel->setText(m_title);
m_nameLabel->setVisible(!m_title.isEmpty());
QString label{ text };
m_nameLabel->setText(label);
m_nameLabel->setVisible(!label.isEmpty());
// setting the stretches to 0 in case of an empty label really hides the label (i.e. even the reserved space)
m_mainLayout->setStretch(0, m_title.isEmpty() ? 0 : LabelColumnStretch);
m_mainLayout->setStretch(1, m_title.isEmpty() ? 0 : ValueColumnStretch);
m_mainLayout->setStretch(0, label.isEmpty() ? 0 : LabelColumnStretch);
m_mainLayout->setStretch(1, label.isEmpty() ? 0 : ValueColumnStretch);
m_identifier = AZ::Crc32(text);
}
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx
-2
View File
@@ -175,8 +175,6 @@ namespace AzToolsFramework
QLabel* m_defaultLabel; // if there is no handler, we use a m_defaultLabel label
InstanceDataNode* m_sourceNode;
QString m_title;
QString m_groupTitle;
QString m_currentFilterString;
struct ChangeNotification
Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
-2
View File
@@ -93,8 +93,6 @@ namespace MaterialEditor
[this](const AzToolsFramework::InstanceDataNode* source, const AzToolsFramework::InstanceDataNode* target) {
AZ_UNUSED(source);
const AtomToolsFramework::DynamicProperty* property = AtomToolsFramework::FindDynamicPropertyForInstanceDataNode(target);
//property->AddEditDataAttributeMemberFunction(AZ::Edit::Attributes::NameLabelOverride, &DynamicProperty::GetDisplayName);
return property && AtomToolsFramework::ArePropertyValuesEqual(property->GetValue(), property->GetConfig().m_parentValue);
});
AddGroup(groupNameId, groupDisplayName, groupDescription, propertyGroupWidget);