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

Renamed TextStyle_None to TextStyle_Regular 

Former-commit-id: 3bd44c785f8c6f011bcade1242b051d8662287d2
This commit is contained in:
Lynix 2015-01-16 12:45:29 +01:00
parent 9d83f3f474
commit bdaa4f2838
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Utility/Enums.hpp
View File

@ -230,7 +230,7 @@ enum nzTextAlign
enum nzTextStyleFlags
{
nzTextStyle_None = 0x0,
nzTextStyle_Regular = 0x0,
nzTextStyle_Bold = 0x1,
nzTextStyle_Italic = 0x2,

2
src/Nazara/Utility/Font.cpp
View File

@ -203,7 +203,7 @@ const NzFont::SizeInfo& NzFont::GetSizeInfo(unsigned int characterSize) const
sizeInfo.underlineThickness = m_data->QueryUnderlineThickness(characterSize);
NzFontGlyph glyph;
if (m_data->ExtractGlyph(characterSize, ' ', nzTextStyle_None, &glyph))
if (m_data->ExtractGlyph(characterSize, ' ', nzTextStyle_Regular, &glyph))
sizeInfo.spaceAdvance = glyph.advance;
else
{

2
src/Nazara/Utility/Loaders/FreeType/Loader.cpp
View File

@ -287,7 +287,7 @@ namespace
bool SupportsStyle(nzUInt32 style) const override
{
///TODO
return style == nzTextStyle_None || style == nzTextStyle_Bold;
return style == nzTextStyle_Regular || style == nzTextStyle_Bold;
}
private: