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

Add an LyShine client API target (#6829)

Browse Source 
* Reduce the need to link with LyShine static lib in other gems

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

* Add UiBasics.Builders to VirtualGamepad.Builders alias

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

* Add UiBasics to LyShine gem's metadata

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

* Change include to a forward declaration

Signed-off-by: abrmich <abrmich@amazon.com>
This commit is contained in:
michabr
2022-01-13 12:56:34 -08:00
committed by GitHub
parent 34d74857f5
commit 193f529b9c
31 changed files with 125 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/UiTextComponent.cpp
+5 -5
View File
@@ -23,7 +23,7 @@
#include <LyShine/Bus/UiCanvasBus.h>
#include <LyShine/UiSerializeHelpers.h>
#include <LyShine/IRenderGraph.h>
#include <LyShine/Draw2d.h>
#include <LyShine/IDraw2d.h>
#include <ILocalizationManager.h>
@@ -1105,7 +1105,7 @@ UiTextComponent::InlineImage::InlineImage(const AZStd::string& texturePathname,
else
{
// Load the texture
m_texture = CDraw2d::LoadTexture(m_filepath);
m_texture = Draw2dHelper::LoadTexture(m_filepath);
if (m_texture)
{
AZ::RHI::Size size = m_texture->GetDescriptor().m_size;
@@ -1157,7 +1157,7 @@ bool UiTextComponent::InlineImage::OnAtlasUnloaded(const TextureAtlasNamespace::
else
{
// Load the texture
m_texture = CDraw2d::LoadTexture(m_filepath);
m_texture = Draw2dHelper::LoadTexture(m_filepath);
}
return true;
}
@@ -2675,7 +2675,7 @@ void UiTextComponent::GetClickableTextRects(UiClickableTextInterface::ClickableT
}
else
{
alignedPosition = CDraw2d::Align(pos, drawBatchLine.lineSize, m_textHAlignment, IDraw2d::VAlign::Top); // y is already aligned
alignedPosition = Draw2dHelper::Align(pos, drawBatchLine.lineSize, m_textHAlignment, IDraw2d::VAlign::Top); // y is already aligned
}
alignedPosition.SetY(alignedPosition.GetY() + newlinePosYIncrement);
@@ -4043,7 +4043,7 @@ void UiTextComponent::RenderDrawBatchLines(
}
else
{
alignedPosition = CDraw2d::Align(pos, drawBatchLine.lineSize, m_textHAlignment, IDraw2d::VAlign::Top); // y is already aligned
alignedPosition = Draw2dHelper::Align(pos, drawBatchLine.lineSize, m_textHAlignment, IDraw2d::VAlign::Top); // y is already aligned
}
alignedPosition.SetY(alignedPosition.GetY() + newlinePosYIncrement);