f648cb1fd8
* Update the FileIOAlias naming to make the cache, project root and engine root paths more clear The alias of `@root@`, `@assets@`, and `@projectplatformcache@` has been collapsed to `@projectproductassets@` The alias of `@devroot@` and `@engroot@` has been collapsed to `@engroot@` The alias of `@devassets@` and `@projectroot@` has been collapsed to `@projectroot@` Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated use of devassets and devroot properties in python Those properties now use projectroot and engroot Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updating the alias @engroot@ alias path comment in each platform specific LocalFileIO_*.cpp file Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed hardcoded size of 9 for the product asset alias. The ResolvePath function now just appends the @projectproductassets@ alias with the input path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Remove duplicate @projectproductassets@ check in ProcessFileTreeRequest Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fix for typos in Hydra python test Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated LocalFileIO::Copy call on Windows to use the Unicode aware CopyFileW API Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the AWSMetreicsGemAllocatorFixture to properly suppress asset cache write errors for Test file creation. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed unneeded call to set the @projectproductasstes@ alias at the bottom of the AssetSeedManagerTest SetUp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Added a deprecated alias map to the FileIO System When a deprecated alias is accessed, the FileIO System logs an AZ_Error and indicates the alias that should be used Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated python test scripts to use the projectroot binding Retrieving the AutomatedTesting project path based on "<devroot>/AutomatedTesting" has been removed. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated references to devroot and devgame within the codebase The GetAbsoluteDevGameFolderPath functions has been replaced with direct call to AZ::Utils::GetProjectPath The GetAbsoluteDevRootFolderPath functions has been replaced with direct calls to AZ::Utils::GetEnginePath Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated <engroot>/AutomatedTesting references to projectroot Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced references that assumes the project path is <engroot>/AutomatedTesting with <projectroot> in the AutomatedTesting python test Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Correct casing in emfxworkspace file Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed newly added AppendPathParts function Removed the Path constructors which accepts a PathIterable instance The PathIterable isn't safe to return to a user of the Path class as it might be referencing temporary paths supplied via PathView arguments Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed unused parameter warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Undid change to the LexicallyProximate function to set the path result to the base path. It needs to return the *this path if the pathResult is empty Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Moved the LocalFileIO ConvertToAbsolutePath implementations to AZ::Utils Fixed the ConvertToAbsolutePath implementation for Unix platforms to use a buffer that is size PATH_MAX(4096 on all our supported Unix platforms). Because the buffer before was AZ::IO::MaxPathLength which as a size of 1024, this was resulting in the Unix `realpath` function smashing the stack when it converts a path to an absolute path that is longer than 1024 characters Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the EditorCore.Tests to attach the AZ Environment to the EditorCore shared library that is statically loaded on launch. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed for DeprecatedAlaisesKeyVisitor Visit function causing the non string_view overloads being hidden causing a hidden base class function warning Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Changed the AWSMetricsGemMock to use a temporary for writing test assets Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the LocalFileIO::ResolvePath function to use HasRootPath to determine if a path starts with a root path such as "D:", "D:/" or "/" IsAbsolute was not the corect check as the path of "D:" is a relative path. To be absolute according to the Windows the path must have a root directory. i.e "D:/" or "D:\" Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed absolute path comment from LocalFile_UnixLike.cpp and LocalFile_Android.cpp FindFiles implementations Updated the ConvertToAlias to supply an AZ::IO::FixedMaxPath Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced usage of the @projectproductassets@ alias with @engroot@ when referring to the LmbrCentral source folder in the CopyDependencyBuilderTest and the SeedBuilderTests Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the ScriptCanvas Upgrade Tool to output backed up files to the Project User Path instead of the engine root Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed whitespacing issues in Application.cpp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Remove unnecessary creation of a FixedMaxPath in the UpgradeTool.cpp Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Modified testSeedFolder variable in the SeedBuilderTests to use the @engroot@ alias instead of @projectproductassets@/.. alias when referring to the LmbrCentral Gem source path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated references to the Project Asset Cache in the PythonTests. Those tests no longer use the logic `azlmbr.paths.projectroot / "Cache" / "pc"` to retrieve a path to the cache root but instead the `azlmbr.paths.projectproductassets` constant Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed the FileIO Deprecated Alias test on Windows Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removing @projectsourceassets@ alias, as it is only used once. Updated the PhysX EditorSystemComponent.cpp to query the ProjectPath form the SettingsRegistry. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Replaced @projectproductassets@ alias with @products@ Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Rollback changes to the PhysX EditorSystemComponent.cpp The changes to use the ProjectPath from the SettingsRegistry has been implemented in PR #4497 Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
207 lines
8.3 KiB
C++
207 lines
8.3 KiB
C++
/*
|
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
*
|
|
*/
|
|
|
|
#include <AzCore/Serialization/SerializeContext.h>
|
|
#include <AzCore/Serialization/EditContext.h>
|
|
#include <ISystem.h>
|
|
#include <LyShine/ILyShine.h>
|
|
#include <LyShine/Bus/UiCanvasBus.h>
|
|
#include <LyShine/Bus/UiCursorBus.h>
|
|
#include <LyShine/Bus/UiElementBus.h>
|
|
#include <LyShine/Bus/UiTextBus.h>
|
|
#include <LyShine/Bus/UiInteractableBus.h>
|
|
#include <LyShineMessagePopup.h>
|
|
|
|
namespace MessagePopup
|
|
{
|
|
//-------------------------------------------------------------------------
|
|
LyShineMessagePopup::LyShineMessagePopup()
|
|
{
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
void LyShineMessagePopup::Reflect(AZ::ReflectContext* context)
|
|
{
|
|
if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
|
|
{
|
|
serialize->Class<LyShineMessagePopup, AZ::Component>()
|
|
->Version(1);
|
|
|
|
if (AZ::EditContext* ec = serialize->GetEditContext())
|
|
{
|
|
ec->Class<LyShineMessagePopup>("MessagePopup", "[Description of functionality provided by this System Component]")
|
|
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
|
|
->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System"))
|
|
->Attribute(AZ::Edit::Attributes::AutoExpand, true)
|
|
;
|
|
}
|
|
}
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
void LyShineMessagePopup::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
|
|
{
|
|
provided.push_back(AZ_CRC("MessagePopupService"));
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
void LyShineMessagePopup::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
|
|
{
|
|
incompatible.push_back(AZ_CRC("MessagePopupService"));
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
void LyShineMessagePopup::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
|
|
{
|
|
(void)required;
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
void LyShineMessagePopup::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
|
|
{
|
|
(void)dependent;
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
void LyShineMessagePopup::Init()
|
|
{
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
void LyShineMessagePopup::Activate()
|
|
{
|
|
MessagePopup::MessagePopupImplBus::Handler::BusConnect();
|
|
}
|
|
|
|
//-------------------------------------------------------------------------
|
|
void LyShineMessagePopup::Deactivate()
|
|
{
|
|
MessagePopup::MessagePopupImplBus::Handler::BusConnect();
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
void LyShineMessagePopup::OnAction([[maybe_unused]] AZ::EntityId entityId, const LyShine::ActionName& actionName)
|
|
{
|
|
const AZ::EntityId* canvasId = UiCanvasNotificationBus::GetCurrentBusId();
|
|
if (!canvasId)
|
|
{
|
|
return;
|
|
}
|
|
|
|
const auto it = m_activePopupIdsByCanvasId.find(*canvasId);
|
|
if (it == m_activePopupIdsByCanvasId.end())
|
|
{
|
|
return;
|
|
}
|
|
|
|
const AZ::u32 popupId = it->second;
|
|
if (actionName == "OnButton1")
|
|
{
|
|
MessagePopup::MessagePopupRequestBus::Broadcast(&MessagePopup::MessagePopupRequestBus::Events::HidePopup, popupId, 0);
|
|
EBUS_EVENT(MessagePopupNotificationsBus, OnHide, popupId, 0);
|
|
}
|
|
else if (actionName == "OnButton2")
|
|
{
|
|
MessagePopup::MessagePopupRequestBus::Broadcast(&MessagePopup::MessagePopupRequestBus::Events::HidePopup, popupId, 1);
|
|
EBUS_EVENT(MessagePopupNotificationsBus, OnHide, popupId, 1);
|
|
}
|
|
else if (actionName == "OnButton3")
|
|
{
|
|
MessagePopup::MessagePopupRequestBus::Broadcast(&MessagePopup::MessagePopupRequestBus::Events::HidePopup, popupId, 2);
|
|
EBUS_EVENT(MessagePopupNotificationsBus, OnHide, popupId, 2);
|
|
}
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
void LyShineMessagePopup::OnShowPopup(AZ::u32 _popupID, const AZStd::string& _message, EPopupButtons _buttons, EPopupKind _kind, AZStd::function<void(int _button)> _callback, void** _popupClientID)
|
|
{
|
|
AZ::EntityId canvasEntityId;
|
|
bool isNavigationSupported = false;
|
|
if (_kind == EPopupKind_Generic)
|
|
{
|
|
switch (_buttons)
|
|
{
|
|
case EPopupButtons::EPopupButtons_NoButtons:
|
|
canvasEntityId = gEnv->pLyShine->LoadCanvas("@products@/ui/canvases/defaultmessagepopup.uicanvas");
|
|
break;
|
|
case EPopupButtons::EPopupButtons_Confirm:
|
|
canvasEntityId = gEnv->pLyShine->LoadCanvas("@products@/ui/canvases/defaultmessagepopup_confirm.uicanvas");
|
|
isNavigationSupported = true;
|
|
break;
|
|
case EPopupButtons::EPopupButtons_YesNo:
|
|
canvasEntityId = gEnv->pLyShine->LoadCanvas("@products@/ui/canvases/defaultmessagepopup_yesno.uicanvas");
|
|
isNavigationSupported = true;
|
|
break;
|
|
}
|
|
}
|
|
else if (_kind == EPopupKind_Toaster)
|
|
{
|
|
canvasEntityId = gEnv->pLyShine->LoadCanvas("@products@/ui/canvases/toaster.uicanvas");
|
|
}
|
|
|
|
if (canvasEntityId.IsValid())
|
|
{
|
|
// Get the canvasID to send to the MessagePopupManager
|
|
LyShine::CanvasId canvasId = 0;
|
|
EBUS_EVENT_ID_RESULT(canvasId, canvasEntityId, UiCanvasBus, GetCanvasId);
|
|
|
|
*_popupClientID = (void*)(AZ::u64)canvasId;
|
|
|
|
// Enable the popup
|
|
AZ::Entity* instructionsTextElement = nullptr;
|
|
EBUS_EVENT_ID(canvasEntityId, UiCanvasBus, SetEnabled, true);
|
|
EBUS_EVENT_ID(canvasEntityId, UiCanvasBus, SetKeepLoadedOnLevelUnload, true);
|
|
|
|
// Set the text
|
|
EBUS_EVENT_ID_RESULT(instructionsTextElement, canvasEntityId, UiCanvasBus, FindElementByName, "Text");
|
|
if (instructionsTextElement != nullptr && instructionsTextElement->GetId().IsValid())
|
|
{
|
|
EBUS_EVENT_ID(instructionsTextElement->GetId(), UiTextBus, SetText, _message.c_str());
|
|
}
|
|
|
|
// Set whether navigation is supported, and show the cursor if so
|
|
UiCanvasBus::Event(canvasEntityId, &UiCanvasInterface::SetIsNavigationSupported, isNavigationSupported);
|
|
if (isNavigationSupported)
|
|
{
|
|
UiCursorBus::Broadcast(&UiCursorInterface::IncrementVisibleCounter);
|
|
}
|
|
|
|
m_activePopupIdsByCanvasId[canvasEntityId] = _popupID;
|
|
|
|
UiCanvasNotificationBus::MultiHandler::BusConnect(canvasEntityId);
|
|
}
|
|
// Having an invalid canvas will rollback to the platform messagepopup
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
void LyShineMessagePopup::OnHidePopup(const MessagePopupInfo& _popupInfo)
|
|
{
|
|
// get the canvas ID in the clientdata
|
|
LyShine::CanvasId canvasId = *((LyShine::CanvasId*)&_popupInfo.m_clientData);
|
|
AZ::EntityId canvasEntityId = gEnv->pLyShine->FindCanvasById(canvasId);
|
|
if (canvasEntityId.IsValid())
|
|
{
|
|
// Hide the cursor if it was shown in LyShineMessagePopup::OnShowPopup
|
|
bool isNavigationSupported = false;
|
|
UiCanvasBus::EventResult(isNavigationSupported, canvasEntityId, &UiCanvasInterface::GetIsNavigationSupported);
|
|
if (isNavigationSupported)
|
|
{
|
|
UiCursorBus::Broadcast(&UiCursorInterface::DecrementVisibleCounter);
|
|
}
|
|
|
|
// Disable the popup
|
|
EBUS_EVENT_ID(canvasEntityId, UiCanvasBus, SetEnabled, false);
|
|
|
|
gEnv->pLyShine->ReleaseCanvas(canvasEntityId, false);
|
|
|
|
UiCanvasNotificationBus::MultiHandler::BusDisconnect(canvasEntityId);
|
|
m_activePopupIdsByCanvasId.erase(canvasEntityId);
|
|
}
|
|
}
|
|
}
|