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

(SimpleTextDrawer) swapped str and characterCount arguments 

Former-commit-id: f009a36533158c37bcf4c996f62967df068a18af
This commit is contained in:
Lynix 2015-01-17 23:07:21 +01:00
parent e495c1094a
commit 9f40fe12b1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Utility/SimpleTextDrawer.hpp
View File

@ -33,8 +33,8 @@ class NAZARA_API NzSimpleTextDrawer : public NzAbstractTextDrawer, NzResourceLis
void SetStyle(nzUInt32 style);
void SetText(const NzString& str);
static NzSimpleTextDrawer Draw(unsigned int characterSize, const NzString& str, nzUInt32 style = nzTextStyle_Regular, const NzColor& color = NzColor::White);
static NzSimpleTextDrawer Draw(NzFont* font, unsigned int characterSize, const NzString& str, nzUInt32 style = nzTextStyle_Regular, const NzColor& color = NzColor::White);
static NzSimpleTextDrawer Draw(const NzString& str, unsigned int characterSize, nzUInt32 style = nzTextStyle_Regular, const NzColor& color = NzColor::White);
static NzSimpleTextDrawer Draw(NzFont* font, const NzString& str, unsigned int characterSize, nzUInt32 style = nzTextStyle_Regular, const NzColor& color = NzColor::White);
private:
NzFont* GetFont(unsigned int index) const override;

4
src/Nazara/Utility/SimpleTextDrawer.cpp
View File

@ -89,7 +89,7 @@ void NzSimpleTextDrawer::SetText(const NzString& str)
m_glyphUpdated = false;
}
NzSimpleTextDrawer NzSimpleTextDrawer::Draw(unsigned int characterSize, const NzString& str, nzUInt32 style, const NzColor& color)
NzSimpleTextDrawer NzSimpleTextDrawer::Draw(const NzString& str, unsigned int characterSize, nzUInt32 style, const NzColor& color)
{
///FIXME: Sans default font ça n'a aucun intérêt
NzSimpleTextDrawer drawer;
@ -101,7 +101,7 @@ NzSimpleTextDrawer NzSimpleTextDrawer::Draw(unsigned int characterSize, const Nz
return drawer;
}
NzSimpleTextDrawer NzSimpleTextDrawer::Draw(NzFont* font, unsigned int characterSize, const NzString& str, nzUInt32 style, const NzColor& color)
NzSimpleTextDrawer NzSimpleTextDrawer::Draw(NzFont* font, const NzString& str, unsigned int characterSize, nzUInt32 style, const NzColor& color)
{
NzSimpleTextDrawer drawer;
drawer.SetCharacterSize(characterSize);