MaterialEditor inheriting from ToolsApplication

Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
2021-06-09 15:19:41 -05:00
parent 326dcc3d10
commit 975be6a480
5 changed files with 264 additions and 3 deletions
@@ -72,7 +72,7 @@ namespace MaterialEditor

    MaterialEditorApplication::MaterialEditorApplication(int* argc, char*** argv)
        : Application(argc, argv)
-        , QApplication(*argc, *argv)
+        , ToolsApplication(*argc, *argv)
    {
        AZ::Debug::TraceMessageBus::Handler::BusConnect();

@@ -21,6 +21,8 @@
 #include <AzToolsFramework/API/AssetDatabaseBus.h>
 #include <AzToolsFramework/API/EditorPythonConsoleBus.h>

+#include <AzQtComponents/Application/ToolsApplication.h>
+
 #include <QApplication>
 #include <QTimer>

@@ -30,13 +32,14 @@ namespace MaterialEditor

    class MaterialEditorApplication
        : public AzFramework::Application
-        , public QApplication
+        //, public QApplication
        , private AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler
        , private MaterialEditorWindowNotificationBus::Handler
        , private AzFramework::AssetSystemStatusBus::Handler
        , private AZ::UserSettingsOwnerRequestBus::Handler
        , private AZ::Debug::TraceMessageBus::Handler
        , private AzToolsFramework::EditorPythonConsoleNotificationBus::Handler
+        , public AzQtComponents::ToolsApplication
    {
    public:
        AZ_TYPE_INFO(MaterialEditor::MaterialEditorApplication, "{30F90CA5-1253-49B5-8143-19CEE37E22BB}");
@@ -39,7 +39,7 @@ int main(int argc, char** argv)
    QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
    AzQtComponents::Utilities::HandleDpiAwareness(AzQtComponents::Utilities::SystemDpiAware);
-
+    //*/
    MaterialEditor::MaterialEditorApplication app(&argc, &argv);

    auto globalEventFilter = new AzQtComponents::GlobalEventFilter(&app);