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

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp
+3 -11
View File
@@ -139,17 +139,13 @@ namespace AzToolsFramework
BaseLogPanel::~BaseLogPanel()
{
while (m_impl->pTabWidget->widget(0))
{
onTabClosed(0);
}
}
void BaseLogPanel::onAddClicked(bool /*checked*/)
{
// user clicked the "Add..." button
NewLogTabDialog newDialog(this);
NewLogTabDialog newDialog(this);
if (newDialog.exec() == QDialog::Accepted)
{
// add a new tab with those settings.
@@ -198,11 +194,7 @@ namespace AzToolsFramework
int newTabIndex = m_impl->pTabWidget->addTab(newTab, QString::fromUtf8(settings.m_tabName.c_str()));
m_impl->pTabWidget->setCurrentIndex(newTabIndex);
m_impl->settingsForTabs.insert(AZStd::make_pair(qobject_cast<QObject*>(newTab), settings));
auto destroyFunction = [this](QObject* destroyedObject)
{
m_impl->settingsForTabs.erase(destroyedObject);
};
connect(newTab, &QObject::destroyed, this, destroyFunction);
connect(newTab, SIGNAL(onLinkActivated(const QString&)), this, SIGNAL(onLinkActivated(const QString&)));
}
}
@@ -882,4 +874,4 @@ namespace AzToolsFramework
} // namespace LogPanel
} // namespace AzToolsFramework
#include "UI/Logging/moc_LogPanel_Panel.cpp"
#include "UI/Logging/moc_LogPanel_Panel.cpp"