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

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
This commit is contained in:
Esteban Papp
2021-08-06 10:08:37 -07:00
parent 03cf71b12d 9e0b8c564d
commit 6db7488939
252 changed files with 2886 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/TrackView/CommentKeyUIControls.cpp
+7 -7
View File
@@ -30,7 +30,7 @@ public:
CSmartVariableEnum<QString> mv_font;
virtual void OnCreateVars()
void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_comment, "Comment");
@@ -41,13 +41,13 @@ public:
AddVariable(mv_table, mv_color, "Color", IVariable::DT_COLOR);
mv_align->SetEnumList(NULL);
mv_align->SetEnumList(nullptr);
mv_align->AddEnumItem("Left", ICommentKey::eTA_Left);
mv_align->AddEnumItem("Center", ICommentKey::eTA_Center);
mv_align->AddEnumItem("Right", ICommentKey::eTA_Right);
AddVariable(mv_table, mv_align, "Align");
mv_font->SetEnumList(NULL);
mv_font->SetEnumList(nullptr);
IFileUtil::FileArray fa;
CFileUtil::ScanDirectory((Path::GetEditingGameDataFolder() + "/Fonts/").c_str(), "*.xml", fa, true);
for (size_t i = 0; i < fa.size(); ++i)
@@ -58,14 +58,14 @@ public:
}
AddVariable(mv_table, mv_font, "Font");
}
bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::CommentText;
}
virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
virtual unsigned int GetPriority() const { return 1; }
unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{