From 04f589637bf6f603a379d5a3666ed586e2f3501d Mon Sep 17 00:00:00 2001 From: twanvl Date: Sat, 30 Jun 2007 18:19:44 +0000 Subject: [PATCH] Removed TextBackground, it never worked anyway git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@453 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/data/field/text.cpp | 9 --------- src/data/field/text.hpp | 11 ----------- 2 files changed, 20 deletions(-) diff --git a/src/data/field/text.cpp b/src/data/field/text.cpp index 6c91e2ba..42fc7cbd 100644 --- a/src/data/field/text.cpp +++ b/src/data/field/text.cpp @@ -81,12 +81,6 @@ void TextStyle::markDependencyMember(const String& name, const Dependency& dep) } } -IMPLEMENT_REFLECTION(TextBackground) { - REFLECT(image); - REFLECT_N("displacement_x", displacement.width); - REFLECT_N("displacement_y", displacement.height); -} - template void reflect_content(T& tag, const TextStyle& ts) {} template <> void reflect_content(GetMember& tag, const TextStyle& ts) { REFLECT_N("content_width", ts.content_width); @@ -115,9 +109,6 @@ IMPLEMENT_REFLECTION(TextStyle) { REFLECT(line_height_line); REFLECT_N("mask", mask_filename); REFLECT(direction); - REFLECT(text_background); - REFLECT(text_background_left); - REFLECT(text_background_right); reflect_content(tag, *this); } diff --git a/src/data/field/text.hpp b/src/data/field/text.hpp index d8446779..c6e6e601 100644 --- a/src/data/field/text.hpp +++ b/src/data/field/text.hpp @@ -47,15 +47,6 @@ class TextField : public Field { // ----------------------------------------------------------------------------- : TextStyle -/// Background behind text -class TextBackground : public IntrusivePtrBase { - public: - ScriptableImage image; ///< background image, stretched to text size - RealSize displacement; - private: - DECLARE_REFLECTION(); -}; - /// The Style for a TextField class TextStyle : public Style { public: @@ -78,8 +69,6 @@ class TextStyle : public Style { String mask_filename; ///< Filename of the mask ContourMask mask; ///< Mask to fit the text to (may be null) Direction direction; ///< In what direction is text layed out? - TextBackgroundP text_background; ///< Image behind the text - TextBackgroundP text_background_left, text_background_right; // information from text rendering double content_width, content_height; ///< Size of the rendered text int content_lines; ///< Number of rendered lines