From 9c63968833d354ec614139ccfe344e1a52f2b5c8 Mon Sep 17 00:00:00 2001 From: Dayo Lawal Date: Tue, 13 Jul 2021 19:24:36 -0500 Subject: [PATCH] Style fixing Signed-off-by: Dayo Lawal --- .../AzQtComponents/Application/AzQtApplication.cpp | 2 +- .../Atom/Tools/MaterialEditor/Code/Source/main.cpp | 12 +----------- .../ShaderManagementConsole/Code/Source/main.cpp | 14 +------------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp index f081159b87..d234a95013 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Application/AzQtApplication.cpp @@ -24,7 +24,7 @@ namespace AzQtComponents // Use a common Qt settings path for applications that don't register their own application name QApplication::setOrganizationName("O3DE"); QApplication::setOrganizationDomain("o3de.org"); - QApplication::setApplicationName("O3DEToolsApplication"); + QApplication::setApplicationName("O3DE Tools Application"); AzQtComponents::PrepareQtPaths(); diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp index 3ea7d37175..2693101ebf 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp @@ -28,18 +28,8 @@ int main(int argc, char** argv) QApplication::setOrganizationDomain("o3de.org"); QApplication::setApplicationName("O3DE Material Editor"); - AzQtComponents::PrepareQtPaths(); + AzQtComponents::AzQtApplication::InitializeDpiScaling(); - 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 - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - 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); diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp index ed5537e93d..4ff38ac73f 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp @@ -28,19 +28,7 @@ int main(int argc, char** argv) QApplication::setOrganizationDomain("o3de.com"); QApplication::setApplicationName("O3DE Shader Management Console"); - AzQtComponents::PrepareQtPaths(); - - 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 - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); - QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); - AzQtComponents::Utilities::HandleDpiAwareness(AzQtComponents::Utilities::PerScreenDpiAware); - - AzQtComponents::AzQtApplication::setDpiScaling(); + AzQtComponents::AzQtApplication::InitializeDpiScaling(); ShaderManagementConsole::ShaderManagementConsoleApplication app(&argc, &argv);