sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Utility

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-24 19:10:53 +02:00
parent b936946154
commit cce32a64d4
120 changed files with 2328 additions and 2971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/Nazara/Utility/RichTextDrawer.inl
View File

@@ -80,7 +80,7 @@ namespace Nz
return m_blocks[index].glyphIndex;
}
inline const FontRef& RichTextDrawer::GetBlockFont(std::size_t index) const
inline const std::shared_ptr<Font>& RichTextDrawer::GetBlockFont(std::size_t index) const
{
NazaraAssert(index < m_blocks.size(), "Invalid block index");
std::size_t fontIndex = m_blocks[index].fontIndex;
@@ -139,7 +139,7 @@ namespace Nz
return m_defaultColor;
}
inline const FontRef& RichTextDrawer::GetDefaultFont() const
inline const std::shared_ptr<Font>& RichTextDrawer::GetDefaultFont() const
{
return m_defaultFont;
}
@@ -164,7 +164,7 @@ namespace Nz
return m_defaultStyle;
}
inline void RichTextDrawer::AppendNewLine(const Font* font, unsigned int characterSize, float lineSpacingOffset) const
inline void RichTextDrawer::AppendNewLine(const Font& font, unsigned int characterSize, float lineSpacingOffset) const
{
AppendNewLine(font, characterSize, lineSpacingOffset, InvalidGlyph, 0);
}
@@ -214,7 +214,7 @@ namespace Nz
return float(sizeInfo.lineHeight) + lineSpacingOffset;
}
inline std::size_t RichTextDrawer::HandleFontAddition(const FontRef& font)
inline std::size_t RichTextDrawer::HandleFontAddition(const std::shared_ptr<Font>& font)
{
auto it = m_fontIndexes.find(font);
if (it == m_fontIndexes.end())
@@ -292,7 +292,7 @@ namespace Nz
InvalidateGlyphs();
}
inline void RichTextDrawer::SetBlockFont(std::size_t index, FontRef font)
inline void RichTextDrawer::SetBlockFont(std::size_t index, std::shared_ptr<Font> font)
{
NazaraAssert(index < m_blocks.size(), "Invalid block index");
std::size_t fontIndex = HandleFontAddition(font);
@@ -375,7 +375,7 @@ namespace Nz
m_defaultColor = color;
}
inline void RichTextDrawer::SetDefaultFont(const FontRef& font)
inline void RichTextDrawer::SetDefaultFont(const std::shared_ptr<Font>& font)
{
m_defaultFont = font;
}
@@ -457,7 +457,7 @@ namespace Nz
*
* \see GetCharacterSize, GetColor, GetStyle, GetText, SetFont
*/
inline const FontRef& RichTextDrawer::BlockRef::GetFont() const
inline const std::shared_ptr<Font>& RichTextDrawer::BlockRef::GetFont() const
{
return m_drawer.GetBlockFont(m_blockIndex);
}
@@ -567,7 +567,7 @@ namespace Nz
*
* \see GetCharacterSize, SetCharacterSize, SetColor, SetStyle, SetText
*/
inline void RichTextDrawer::BlockRef::SetFont(FontRef font)
inline void RichTextDrawer::BlockRef::SetFont(std::shared_ptr<Font> font)
{
m_drawer.SetBlockFont(m_blockIndex, std::move(font));
}