diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp index 67c72f6e5d..0102bb62d1 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp @@ -34,7 +34,12 @@ 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 + + } + + void AzQtApplication::setDpiScaling() + { + // 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); diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.h b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.h index 32221836c1..0a7bfc8d27 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.h +++ b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.h @@ -24,8 +24,9 @@ namespace AzQtComponents { public: AzQtApplication(int& argc, char** argv); + void static setDpiScaling(); - private: + protected: AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING AZStd::unique_ptr m_traceLogger; AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtTraceLogger.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtTraceLogger.cpp index f5fddf3689..da6254f018 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtTraceLogger.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtTraceLogger.cpp @@ -40,7 +40,7 @@ namespace AzQtComponents return false; } - void AzQtTraceLogger::WriteStartupLog() + void AzQtTraceLogger::WriteStartupLog(char name[]) { using namespace AzFramework; @@ -61,7 +61,7 @@ namespace AzQtComponents fileIO->CreatePath("@log@"); AZStd::string logPath; - StringFunc::Path::Join(logDirectory.c_str(), "MaterialEditor.log", logPath); + StringFunc::Path::Join(logDirectory.c_str(), name, logPath); m_logFile.reset(aznew LogFile(logPath.c_str())); if (m_logFile) diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtTraceLogger.h b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtTraceLogger.h index 505da253c5..29dfd6b32a 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtTraceLogger.h +++ b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtTraceLogger.h @@ -23,14 +23,14 @@ namespace AzQtComponents AzQtTraceLogger(); ~AzQtTraceLogger(); + void WriteStartupLog(char name[]); + protected: ////////////////////////////////////////////////////////////////////////// // AZ::Debug::TraceMessageBus::Handler overrides... bool OnOutput(const char* window, const char* message) override; ////////////////////////////////////////////////////////////////////////// - void WriteStartupLog(); - struct LogMessage { public: @@ -40,6 +40,5 @@ namespace AzQtComponents AZStd::vector m_startupLogSink; AZStd::unique_ptr m_logFile; }; - } diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp index f6be1d9d5a..2cc2bb852e 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp @@ -476,7 +476,7 @@ namespace MaterialEditor return; } - WriteStartupLog(); + m_traceLogger->WriteStartupLog("MaterialEditor.log"); if (!LaunchDiscoveryService()) { diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp index 538d351237..e59bbde17d 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp @@ -39,6 +39,8 @@ #include #include +#include + AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT #include #include diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp index d3130cd28a..ed5537e93d 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -39,7 +40,10 @@ int main(int argc, char** argv) QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); AzQtComponents::Utilities::HandleDpiAwareness(AzQtComponents::Utilities::PerScreenDpiAware); + AzQtComponents::AzQtApplication::setDpiScaling(); + ShaderManagementConsole::ShaderManagementConsoleApplication app(&argc, &argv); + AZ::IO::FixedMaxPath engineRootPath; if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr) {