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

Addressing change requests for pull request

Browse Source 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
This commit is contained in:
Dayo Lawal
2021-06-15 12:40:54 -05:00
committed by Dayo Lawal
parent 1cadf34dc3
commit 31a2ccb041
4 changed files with 20 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp
+6 -10
View File
@@ -28,15 +28,12 @@ namespace AzQtComponents
}
AzQtApplication* m_app;
bool OnOutput(const char* window, const char* message) override;
//////////////////////////////////////////////////////////////////////////
// AZ::Debug::TraceMessageBus::Handler overrides...
bool OnOutput(const char* window, const char* message) override;
//////////////////////////////////////////////////////////////////////////
protected:
struct LogMessage
{
AZStd::string window;
AZStd::string message;
};
AZStd::vector<LogMessage> m_startupLogSink;
AZStd::unique_ptr<AzFramework::LogFile> m_logFile;
@@ -58,8 +55,8 @@ namespace AzQtComponents
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
// Must be set before QApplication is initialized, so that we support HighDpi monitors, like the Retina displays
// on Windows 10
// Must be set before QApplication is initialized, so that we support HighDpi monitors, like the Retina displays
// on Windows 10
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
@@ -69,7 +66,6 @@ namespace AzQtComponents
m_impl->AZ::Debug::TraceMessageBus::Handler::BusConnect();
}
AzQtApplication::~AzQtApplication()
Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.h
+13 -32
View File
@@ -14,41 +14,13 @@
#pragma once
#include <QApplication>
#include <QTimer>
#include <QMainWindow>
#include <AzFramework/Application/Application.h>
#include <AzQtComponents/Components/GlobalEventFilter.h>
#include <AzQtComponents/Components/StyledDockWidget.h>
#include <AzQtComponents/Components/O3DEStylesheet.h>
#include <AzQtComponents/Utilities/HandleDpiAwareness.h>
#include <AzQtComponents/Components/WindowDecorationWrapper.h>
#include <AzQtComponents/AzQtComponentsAPI.h>
#include <AzQtComponents/Utilities/QtPluginPaths.h>
#include <AzQtComponents/Components/DockMainWindow.h>
#include <AzQtComponents/Components/FancyDocking.h>
#include <AzQtComponents/Components/Widgets/TabWidget.h>
#include <AzFramework/StringFunc/StringFunc.h>
#include <AzFramework/Logging/LogFile.h>
#include <AzFramework/CommandLine/CommandLine.h>
#include <AzFramework/API/ApplicationAPI.h>
#include <AzQtComponents/Utilities/HandleDpiAwareness.h>
#include <AzQtComponents/Utilities/QtPluginPaths.h>
#include <AzCore/Debug/TraceMessageBus.h>
#include <AzCore/std/containers/unordered_map.h>
#include <AzCore/Component/ComponentApplication.h>
#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
#include <AzCore/Debug/TraceMessageBus.h>
#include <AzCore/UserSettings/UserSettingsProvider.h>
#include <AzCore/Debug/TraceMessageBus.h>
#include <AzCore/IO/SystemFile.h>
#include <AzCore/Interface/Interface.h>
#include <AzFramework/Archive/IArchive.h>
#include <AzFramework/Archive/ArchiveFileIO.h>
#include <AzCore/NativeUI/NativeUIRequests.h>
#include <AzCore/NativeUI/NativeUISystemComponent.h>
namespace AzQtComponents
{
@@ -58,13 +30,22 @@ namespace AzQtComponents
public:
AzQtApplication(int& argc, char** argv);
~AzQtApplication();
private:
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
class Impl;
AZStd::unique_ptr<Impl> m_impl;
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
};
class LogMessage
{
public:
AZStd::string window;
AZStd::string message;
};
} // namespace AzQtComponents
Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
+1 -19
View File
@@ -88,7 +88,7 @@ namespace MaterialEditor
{
AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusDisconnect();
MaterialEditorWindowNotificationBus::Handler::BusDisconnect();
AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
}
void MaterialEditorApplication::CreateReflectionManager()
@@ -281,24 +281,6 @@ namespace MaterialEditor
}
}
bool MaterialEditorApplication::OnOutput(const char* window, const char* message)
{
// Suppress spam from the Source Control system
if (0 == strncmp(window, AzToolsFramework::SCC_WINDOW, AZ_ARRAY_SIZE(AzToolsFramework::SCC_WINDOW)))
{
return true;
}
if (m_logFile)
{
m_logFile->AppendLog(AzFramework::LogFile::SEV_NORMAL, window, message);
}
else
{
m_startupLogSink.push_back({ window, message });
}
return false;
}
void MaterialEditorApplication::ProcessCommandLine(const AZ::CommandLine& commandLine)
{
Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
-7
View File
@@ -96,11 +96,6 @@ namespace MaterialEditor
void SaveSettings() override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// AZ::Debug::TraceMessageBus::Handler overrides...
bool OnOutput(const char* window, const char* message) override;
//////////////////////////////////////////////////////////////////////////
void CompileCriticalAssets();
void ProcessCommandLine(const AZ::CommandLine& commandLine);
@@ -121,8 +116,6 @@ namespace MaterialEditor
AZStd::string message;
};
AZStd::vector<LogMessage> m_startupLogSink;
AZStd::unique_ptr<AzFramework::LogFile> m_logFile;
//! Local user settings are used to store material browser tree expansion state
AZ::UserSettingsProvider m_localUserSettings;