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
Code/Sandbox/Editor/ToolbarManager.cpp
+21 -13
View File
@@ -705,25 +705,33 @@ void ToolbarManager::RestoreToolbarDefaults(const QString& toolbarName)
const AmazonToolbar* defaultToolbar = FindDefaultToolbar(toolbarName);
AmazonToolbar* existingToolbar = FindToolbar(toolbarName);
Q_ASSERT(existingToolbar != nullptr);
const bool isInstantiated = existingToolbar->IsInstantiated();
if (isInstantiated)
if (existingToolbar != nullptr)
{
// We have a QToolBar instance, updated it too
for (QAction* action : existingToolbar->Toolbar()->actions())
const bool isInstantiated = existingToolbar->IsInstantiated();
if (isInstantiated)
{
existingToolbar->Toolbar()->removeAction(action);
// We have a QToolBar instance, updated it too
for (QAction* action : existingToolbar->Toolbar()->actions())
{
existingToolbar->Toolbar()->removeAction(action);
}
}
}
existingToolbar->CopyActions(*defaultToolbar);
Q_ASSERT(defaultToolbar != nullptr);
if (defaultToolbar != nullptr)
{
existingToolbar->CopyActions(*defaultToolbar);
}
if (isInstantiated)
{
existingToolbar->SetActionsOnInternalToolbar(m_actionManager);
existingToolbar->UpdateAllowedAreas();
if (isInstantiated)
{
existingToolbar->SetActionsOnInternalToolbar(m_actionManager);
existingToolbar->UpdateAllowedAreas();
}
SaveToolbars();
}
SaveToolbars();
}
else
{
@@ -1166,7 +1174,7 @@ bool EditableQToolBar::eventFilter(QObject* obj, QEvent* ev)
mimeData->setText(action->text());
drag->setMimeData(mimeData);
Qt::DropAction dropAction = drag->exec();
drag->exec();
m_dndIndicator->setLastDragPos(QPoint());
return true;
}