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

Gems/LyShine

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-16 15:57:19 -07:00
parent 939c188448
commit 2ab9648425
9 changed files with 194 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp
+72 -72
View File
@@ -95,88 +95,88 @@ public:
}
protected:
void dragMoveEvent(QDragMoveEvent* event)
void dragMoveEvent([[maybe_unused]] QDragMoveEvent* event)
{
// For now we do not support any drag and drop in the Nodes pane
return;
CUiAnimViewNodesCtrl::CRecord* pRecord = (CUiAnimViewNodesCtrl::CRecord*) itemAt(event->pos());
if (!pRecord)
{
return;
}
CUiAnimViewNode* pTargetNode = pRecord->GetNode();
QTreeWidget::dragMoveEvent(event);
if (!event->isAccepted())
{
return;
}
if (pTargetNode && pTargetNode->IsGroupNode() /*&& !m_draggedNodes.DoesContain(pTargetNode)*/)
{
CUiAnimViewAnimNode* pDragTarget = static_cast<CUiAnimViewAnimNode*>(pTargetNode);
bool bAllValidReparenting = true;
QList<CUiAnimViewAnimNode*> nodes = draggedNodes(event);
Q_FOREACH(CUiAnimViewAnimNode * pDraggedNode, nodes)
{
if (!pDraggedNode->IsValidReparentingTo(pDragTarget))
{
bAllValidReparenting = false;
break;
}
}
if (!bAllValidReparenting)
{
event->ignore();
}
return;
}
//CUiAnimViewNodesCtrl::CRecord* pRecord = (CUiAnimViewNodesCtrl::CRecord*) itemAt(event->pos());
//if (!pRecord)
//{
// return;
//}
//CUiAnimViewNode* pTargetNode = pRecord->GetNode();
//
//QTreeWidget::dragMoveEvent(event);
//if (!event->isAccepted())
//{
// return;
//}
//
//if (pTargetNode && pTargetNode->IsGroupNode() /*&& !m_draggedNodes.DoesContain(pTargetNode)*/)
//{
// CUiAnimViewAnimNode* pDragTarget = static_cast<CUiAnimViewAnimNode*>(pTargetNode);
// bool bAllValidReparenting = true;
// QList<CUiAnimViewAnimNode*> nodes = draggedNodes(event);
// Q_FOREACH(CUiAnimViewAnimNode * pDraggedNode, nodes)
// {
// if (!pDraggedNode->IsValidReparentingTo(pDragTarget))
// {
// bAllValidReparenting = false;
// break;
// }
// }
//
// if (!bAllValidReparenting)
// {
// event->ignore();
// }
//
// return;
//}
}
void dropEvent(QDropEvent* event)
void dropEvent([[maybe_unused]] QDropEvent* event)
{
// For now we do not support any drag and drop in the Nodes pane
return;
CUiAnimViewNodesCtrl::CRecord* pRecord = (CUiAnimViewNodesCtrl::CRecord*) itemAt(event->pos());
if (!pRecord)
{
return;
}
CUiAnimViewNode* pTargetNode = pRecord->GetNode();
QTreeWidget::dropEvent(event);
if (!event->isAccepted())
{
return;
}
if (pTargetNode && pTargetNode->IsGroupNode() /*&& !m_draggedNodes.DoesContain(pTargetNode)*/)
{
CUiAnimViewAnimNode* pDragTarget = static_cast<CUiAnimViewAnimNode*>(pTargetNode);
bool bAllValidReparenting = true;
QList<CUiAnimViewAnimNode*> nodes = draggedNodes(event);
Q_FOREACH(CUiAnimViewAnimNode * pDraggedNode, nodes)
{
if (!pDraggedNode->IsValidReparentingTo(pDragTarget))
{
bAllValidReparenting = false;
break;
}
}
if (bAllValidReparenting)
{
UiAnimUndo undo("Drag and Drop UiAnimView Nodes");
Q_FOREACH(CUiAnimViewAnimNode * pDraggedNode, nodes)
{
pDraggedNode->SetNewParent(pDragTarget);
}
}
}
//CUiAnimViewNodesCtrl::CRecord* pRecord = (CUiAnimViewNodesCtrl::CRecord*) itemAt(event->pos());
//if (!pRecord)
//{
// return;
//}
//CUiAnimViewNode* pTargetNode = pRecord->GetNode();
//
//QTreeWidget::dropEvent(event);
//if (!event->isAccepted())
//{
// return;
//}
//
//if (pTargetNode && pTargetNode->IsGroupNode() /*&& !m_draggedNodes.DoesContain(pTargetNode)*/)
//{
// CUiAnimViewAnimNode* pDragTarget = static_cast<CUiAnimViewAnimNode*>(pTargetNode);
// bool bAllValidReparenting = true;
// QList<CUiAnimViewAnimNode*> nodes = draggedNodes(event);
// Q_FOREACH(CUiAnimViewAnimNode * pDraggedNode, nodes)
// {
// if (!pDraggedNode->IsValidReparentingTo(pDragTarget))
// {
// bAllValidReparenting = false;
// break;
// }
// }
//
// if (bAllValidReparenting)
// {
// UiAnimUndo undo("Drag and Drop UiAnimView Nodes");
// Q_FOREACH(CUiAnimViewAnimNode * pDraggedNode, nodes)
// {
// pDraggedNode->SetNewParent(pDragTarget);
// }
// }
//}
}
void keyPressEvent(QKeyEvent* event)