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

Incorporating review comments. Adding nativeUI setting for launchers.

Browse Source
This commit is contained in:
mgwynn
2021-06-25 15:34:32 -04:00
parent fb3940fa31
commit 692c993bdb
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/NativeUI/NativeUIRequests.h
+4 -4
View File
@@ -27,8 +27,8 @@ namespace AZ::NativeUI
enum class Mode
{
CONSOLE = 0,
UI,
DISABLED = 0,
ENABLED,
};
class NativeUIRequests
@@ -77,8 +77,8 @@ namespace AZ::NativeUI
m_mode = mode;
}
protected:
NativeUI::Mode m_mode = NativeUI::Mode::CONSOLE;
protected:
NativeUI::Mode m_mode = NativeUI::Mode::DISABLED;
};
class NativeUIEBusTraits
Code/Framework/AzCore/AzCore/NativeUI/NativeUISystemComponent.cpp
+3 -3
View File
@@ -29,7 +29,7 @@ namespace AZ::NativeUI
AssertAction NativeUISystem::DisplayAssertDialog(const AZStd::string& message) const
{
if (m_mode == NativeUI::Mode::CONSOLE)
if (m_mode == NativeUI::Mode::DISABLED)
{
return AssertAction::NONE;
}
@@ -56,7 +56,7 @@ namespace AZ::NativeUI
AZStd::string NativeUISystem::DisplayOkDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const
{
if (m_mode == NativeUI::Mode::CONSOLE)
if (m_mode == NativeUI::Mode::DISABLED)
{
return {};
}
@@ -73,7 +73,7 @@ namespace AZ::NativeUI
AZStd::string NativeUISystem::DisplayYesNoDialog(const AZStd::string& title, const AZStd::string& message, bool showCancel) const
{
if (m_mode == NativeUI::Mode::CONSOLE)
if (m_mode == NativeUI::Mode::DISABLED)
{
return {};
}
Code/Framework/AzCore/Platform/Windows/AzCore/NativeUI/NativeUISystemComponent_Windows.cpp
+1 -1
View File
@@ -247,7 +247,7 @@ namespace AZ
{
AZStd::string NativeUISystem::DisplayBlockingDialog(const AZStd::string& title, const AZStd::string& message, const AZStd::vector<AZStd::string>& options) const
{
if (m_mode == NativeUI::Mode::CONSOLE)
if (m_mode == NativeUI::Mode::DISABLED)
{
return {};
}
Code/LauncherUnified/Launcher.cpp
+13
View File
@@ -573,6 +573,14 @@ namespace O3DELauncher
AZ_Assert(AZ::AllocatorInstance<AZ::SystemAllocator>::IsReady(), "System allocator was not created or creation failed.");
//Initialize the Debug trace instance to create necessary environment variables
AZ::Debug::Trace::Instance().Init();
if (!IsDedicatedServer() && !systemInitParams.bToolMode && !systemInitParams.bTestMode)
{
if (auto nativeUI = AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get(); nativeUI != nullptr)
{
nativeUI->SetMode(AZ::NativeUI::Mode::ENABLED);
}
}
}
if (mainInfo.m_onPostAppStart)
@@ -647,6 +655,11 @@ namespace O3DELauncher
ReturnCode status = ReturnCode::Success;
if (auto nativeUI = AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get(); nativeUI != nullptr)
{
nativeUI->DisplayOkDialog("Test", "Test", false);
}
if (systemInitParams.pSystem)
{
// Process queued events before main loop.
Code/Sandbox/Editor/CryEdit.cpp
+1 -1
View File
@@ -4368,7 +4368,7 @@ extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
{
if (auto nativeUI = AZ::Interface<AZ::NativeUI::NativeUIRequests>::Get(); nativeUI != nullptr)
{
nativeUI->SetMode(AZ::NativeUI::Mode::UI);
nativeUI->SetMode(AZ::NativeUI::Mode::ENABLED);
}
}
}