From 4619099a01bbbb2cb45ea2672c43a3373b490c24 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 25 Nov 2015 18:20:02 +0100 Subject: [PATCH] Core/SimpleTextDrawer: Fix assignment operator Former-commit-id: 52aa69ef0712d142ab36eae6dedf084c32a08012 --- include/Nazara/Utility/SimpleTextDrawer.hpp | 2 +- src/Nazara/Utility/SimpleTextDrawer.cpp | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Utility/SimpleTextDrawer.hpp b/include/Nazara/Utility/SimpleTextDrawer.hpp index 2d2709679..22b52f293 100644 --- a/include/Nazara/Utility/SimpleTextDrawer.hpp +++ b/include/Nazara/Utility/SimpleTextDrawer.hpp @@ -41,7 +41,7 @@ namespace Nz void SetStyle(UInt32 style); void SetText(const String& str); - SimpleTextDrawer& operator=(const SimpleTextDrawer& drawer) = default; + SimpleTextDrawer& operator=(const SimpleTextDrawer& drawer); SimpleTextDrawer& operator=(SimpleTextDrawer&& drawer); static SimpleTextDrawer Draw(const String& str, unsigned int characterSize, UInt32 style = TextStyle_Regular, const Color& color = Color::White); diff --git a/src/Nazara/Utility/SimpleTextDrawer.cpp b/src/Nazara/Utility/SimpleTextDrawer.cpp index 842f8ed20..6f7393dd9 100644 --- a/src/Nazara/Utility/SimpleTextDrawer.cpp +++ b/src/Nazara/Utility/SimpleTextDrawer.cpp @@ -144,6 +144,19 @@ namespace Nz m_glyphUpdated = false; } + SimpleTextDrawer& SimpleTextDrawer::operator=(const SimpleTextDrawer& drawer) + { + m_characterSize = drawer.m_characterSize; + m_color = drawer.m_color; + m_style = drawer.m_style; + m_text = drawer.m_text; + + m_glyphUpdated = false; + SetFont(drawer.m_font); + + return *this; + } + SimpleTextDrawer& SimpleTextDrawer::operator=(SimpleTextDrawer&& drawer) { DisconnectFontSlots();