From 9f40fe12b10d4427888a85b8e0b70826acc77827 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 17 Jan 2015 23:07:21 +0100 Subject: [PATCH] (SimpleTextDrawer) swapped str and characterCount arguments Former-commit-id: f009a36533158c37bcf4c996f62967df068a18af --- include/Nazara/Utility/SimpleTextDrawer.hpp | 4 ++-- src/Nazara/Utility/SimpleTextDrawer.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Utility/SimpleTextDrawer.hpp b/include/Nazara/Utility/SimpleTextDrawer.hpp index ca4b11845..47fa31517 100644 --- a/include/Nazara/Utility/SimpleTextDrawer.hpp +++ b/include/Nazara/Utility/SimpleTextDrawer.hpp @@ -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; diff --git a/src/Nazara/Utility/SimpleTextDrawer.cpp b/src/Nazara/Utility/SimpleTextDrawer.cpp index e16161d69..855a2ec0b 100644 --- a/src/Nazara/Utility/SimpleTextDrawer.cpp +++ b/src/Nazara/Utility/SimpleTextDrawer.cpp @@ -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);