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

Make ILyShine an AZ::Interface (#6923)

Browse Source 
* Move ILyShine instance out of legacy code

Signed-off-by: abrmich <abrmich@amazon.com>

* Remove last remaining reference of gEnv->pLyShine

Signed-off-by: abrmich <abrmich@amazon.com>

* Make m_lyShine a unique pointer

Signed-off-by: abrmich <abrmich@amazon.com>
This commit is contained in:
michabr
2022-01-21 15:03:57 -08:00
committed by GitHub
parent cdf748a5ed
commit 7fa6a82f55
25 changed files with 97 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/MessagePopup/Code/Source/LyShineMessagePopup.cpp
+6 -6
View File
@@ -127,21 +127,21 @@ namespace MessagePopup
switch (_buttons)
{
case EPopupButtons::EPopupButtons_NoButtons:
canvasEntityId = gEnv->pLyShine->LoadCanvas("@products@/ui/canvases/defaultmessagepopup.uicanvas");
canvasEntityId = AZ::Interface<ILyShine>::Get()->LoadCanvas("@products@/ui/canvases/defaultmessagepopup.uicanvas");
break;
case EPopupButtons::EPopupButtons_Confirm:
canvasEntityId = gEnv->pLyShine->LoadCanvas("@products@/ui/canvases/defaultmessagepopup_confirm.uicanvas");
canvasEntityId = AZ::Interface<ILyShine>::Get()->LoadCanvas("@products@/ui/canvases/defaultmessagepopup_confirm.uicanvas");
isNavigationSupported = true;
break;
case EPopupButtons::EPopupButtons_YesNo:
canvasEntityId = gEnv->pLyShine->LoadCanvas("@products@/ui/canvases/defaultmessagepopup_yesno.uicanvas");
canvasEntityId = AZ::Interface<ILyShine>::Get()->LoadCanvas("@products@/ui/canvases/defaultmessagepopup_yesno.uicanvas");
isNavigationSupported = true;
break;
}
}
else if (_kind == EPopupKind_Toaster)
{
canvasEntityId = gEnv->pLyShine->LoadCanvas("@products@/ui/canvases/toaster.uicanvas");
canvasEntityId = AZ::Interface<ILyShine>::Get()->LoadCanvas("@products@/ui/canvases/toaster.uicanvas");
}
if (canvasEntityId.IsValid())
@@ -183,7 +183,7 @@ namespace MessagePopup
{
// get the canvas ID in the clientdata
LyShine::CanvasId canvasId = *((LyShine::CanvasId*)&_popupInfo.m_clientData);
AZ::EntityId canvasEntityId = gEnv->pLyShine->FindCanvasById(canvasId);
AZ::EntityId canvasEntityId = AZ::Interface<ILyShine>::Get()->FindCanvasById(canvasId);
if (canvasEntityId.IsValid())
{
// Hide the cursor if it was shown in LyShineMessagePopup::OnShowPopup
@@ -197,7 +197,7 @@ namespace MessagePopup
// Disable the popup
EBUS_EVENT_ID(canvasEntityId, UiCanvasBus, SetEnabled, false);
gEnv->pLyShine->ReleaseCanvas(canvasEntityId, false);
AZ::Interface<ILyShine>::Get()->ReleaseCanvas(canvasEntityId, false);
UiCanvasNotificationBus::MultiHandler::BusDisconnect(canvasEntityId);
m_activePopupIdsByCanvasId.erase(canvasEntityId);