Integrating latest 47acbe8

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
@@ -19,9 +19,7 @@
#include <AzCore/Component/Entity.h>
#include <AzCore/Component/ComponentApplicationBus.h>
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx>
#include <QVBoxLayout>
@@ -55,6 +53,36 @@ void QComponentEntityEditorOutlinerWindow::Init()
setCentralWidget(window);
}
QEntityOutlinerWindow::QEntityOutlinerWindow(QWidget* parent)
: QMainWindow(parent)
, m_outlinerWidget(nullptr)
{
gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(this);
Init();
}
QEntityOutlinerWindow::~QEntityOutlinerWindow()
{
gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
}
void QEntityOutlinerWindow::OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
{
}
void QEntityOutlinerWindow::Init()
{
QVBoxLayout* layout = new QVBoxLayout();
m_outlinerWidget = new AzToolsFramework::EntityOutlinerWidget(nullptr);
layout->addWidget(m_outlinerWidget);
QWidget* window = new QWidget();
window->setLayout(layout);
setCentralWidget(window);
}
///////////////////////////////////////////////////////////////////////////////
// End of context menu handling
///////////////////////////////////////////////////////////////////////////////