From d1e12a6d2e1bcbc3da3bccde95cb39d03cb2822f Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 23 Apr 2016 22:48:14 +0200 Subject: [PATCH] Sdk/Binding: Bind Font::GetDefault Former-commit-id: 5245ada09cd376dfaf69f06ca982c89dc438fae8 --- SDK/src/NDK/LuaBinding_Utility.cpp | 3 ++- include/Nazara/Utility/Font.hpp | 2 +- src/Nazara/Utility/Font.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SDK/src/NDK/LuaBinding_Utility.cpp b/SDK/src/NDK/LuaBinding_Utility.cpp index a8893e1a4..8ffa7824d 100644 --- a/SDK/src/NDK/LuaBinding_Utility.cpp +++ b/SDK/src/NDK/LuaBinding_Utility.cpp @@ -141,7 +141,8 @@ namespace Ndk fontClass.BindMethod("SetGlyphBorder", &Nz::Font::SetGlyphBorder); fontClass.BindMethod("SetMinimumStepSize", &Nz::Font::SetMinimumStepSize); - fontClass.BindStaticMethod("GetDefaultGlyphBorder", &Nz::Font::GetDefaultGlyphBorder); + fontClass.BindStaticMethod("GetDefault", &Nz::Font::GetDefault); + fontClass.BindStaticMethod("GetDefaultGlyphBorder", &Nz::Font::GetDefaultGlyphBorder); fontClass.BindStaticMethod("GetDefaultMinimumStepSize", &Nz::Font::GetDefaultMinimumStepSize); fontClass.BindStaticMethod("SetDefaultGlyphBorder", &Nz::Font::SetDefaultGlyphBorder); diff --git a/include/Nazara/Utility/Font.hpp b/include/Nazara/Utility/Font.hpp index 58ff341b5..257e91245 100644 --- a/include/Nazara/Utility/Font.hpp +++ b/include/Nazara/Utility/Font.hpp @@ -89,7 +89,7 @@ namespace Nz Font& operator=(Font&&) = delete; static std::shared_ptr GetDefaultAtlas(); - static Font* GetDefault(); + static const FontRef& GetDefault(); static unsigned int GetDefaultGlyphBorder(); static unsigned int GetDefaultMinimumStepSize(); diff --git a/src/Nazara/Utility/Font.cpp b/src/Nazara/Utility/Font.cpp index b7cefb362..9e26d28bb 100644 --- a/src/Nazara/Utility/Font.cpp +++ b/src/Nazara/Utility/Font.cpp @@ -350,7 +350,7 @@ namespace Nz return s_defaultAtlas; } - Font* Font::GetDefault() + const FontRef& Font::GetDefault() { // Nous n'initialisons la police par défaut qu'à la demande pour qu'elle prenne // les paramètres par défaut (qui peuvent avoir étés changés par l'utilisateur),