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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp
+5 -9
View File
@@ -502,8 +502,6 @@ CUiAnimViewNodesCtrl::CRecord* CUiAnimViewNodesCtrl::AddAnimNodeRecord(CRecord*
//////////////////////////////////////////////////////////////////////////
CUiAnimViewNodesCtrl::CRecord* CUiAnimViewNodesCtrl::AddTrackRecord(CRecord* pParentRecord, CUiAnimViewTrack* pTrack)
{
const CUiAnimViewAnimNode* pAnimNode = pTrack->GetAnimNode();
CRecord* pNewTrackRecord = new CRecord(pTrack);
pNewTrackRecord->setSizeHint(0, QSize(30, 18));
pNewTrackRecord->setText(0, QtUtil::ToQString(pTrack->GetName()));
@@ -749,7 +747,7 @@ void CUiAnimViewNodesCtrl::OnFillItems()
// Additional empty record like space for scrollbar in key control
CRecord* pGroupRec = new CRecord();
pGroupRec->setSizeHint(0, QSize(width(), 18));
ui->treeWidget->addTopLevelItem(pRootGroupRec);
ui->treeWidget->addTopLevelItem(pGroupRec);
}
}
@@ -1086,7 +1084,7 @@ void CUiAnimViewNodesCtrl::OnNMRclick(QPoint point)
if (pAnimNode)
{
QString matName;
int subMtlIndex = GetMatNameAndSubMtlIndexFromName(matName, pAnimNode->GetName());
GetMatNameAndSubMtlIndexFromName(matName, pAnimNode->GetName());
QString newMatName;
newMatName = QStringLiteral("%1.[%2]").arg(matName).arg(cmd - eMI_SelectSubmaterialBase + 1);
UiAnimUndo undo("Rename Animation node");
@@ -1196,7 +1194,6 @@ void CUiAnimViewNodesCtrl::AddGroupNodeAddItems(UiAnimContextMenu& contextMenu,
}
const bool bIsDirectorOrSequence = (pAnimNode->GetType() == eUiAnimNodeType_Director || pAnimNode->GetNodeType() == eUiAVNT_Sequence);
CUiAnimViewAnimNode* pDirector = bIsDirectorOrSequence ? pAnimNode : pAnimNode->GetDirector();
#if UI_ANIMATION_REMOVED
@@ -1411,7 +1408,6 @@ int CUiAnimViewNodesCtrl::ShowPopupMenuMultiSelection(UiAnimContextMenu& context
for (int currentNode = 0; currentNode < records.size(); ++currentNode)
{
CRecord* pItemInfo = (CRecord*)records[currentNode];
EUiAnimViewNodeType type = pItemInfo->GetNode()->GetNodeType();
if (pItemInfo->GetNode()->GetNodeType() == eUiAVNT_AnimNode)
{
@@ -1614,7 +1610,8 @@ void CUiAnimViewNodesCtrl::ShowNextResult()
if (!items.empty())
{
m_currentMatchIndex = ++m_currentMatchIndex % m_matchCount;
++m_currentMatchIndex;
m_currentMatchIndex = m_currentMatchIndex % m_matchCount;
ui->treeWidget->selectionModel()->clear();
items[m_currentMatchIndex]->setSelected(true);
}
@@ -1696,8 +1693,7 @@ CUiAnimViewNodesCtrl::CRecord* CUiAnimViewNodesCtrl::GetNodeRecord(const CUiAnim
return nullptr;
}
CRecord* pRecord = findIter->second;
assert (pRecord->GetNode() == pNode);
assert (findIter->second->GetNode() == pNode);
return findIter->second;
}