mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-12 21:47:00 -04:00
Removed TextBackground, it never worked anyway
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@453 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -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 <typename T> void reflect_content(T& tag, const TextStyle& ts) {}
|
template <typename T> void reflect_content(T& tag, const TextStyle& ts) {}
|
||||||
template <> void reflect_content(GetMember& tag, const TextStyle& ts) {
|
template <> void reflect_content(GetMember& tag, const TextStyle& ts) {
|
||||||
REFLECT_N("content_width", ts.content_width);
|
REFLECT_N("content_width", ts.content_width);
|
||||||
@@ -115,9 +109,6 @@ IMPLEMENT_REFLECTION(TextStyle) {
|
|||||||
REFLECT(line_height_line);
|
REFLECT(line_height_line);
|
||||||
REFLECT_N("mask", mask_filename);
|
REFLECT_N("mask", mask_filename);
|
||||||
REFLECT(direction);
|
REFLECT(direction);
|
||||||
REFLECT(text_background);
|
|
||||||
REFLECT(text_background_left);
|
|
||||||
REFLECT(text_background_right);
|
|
||||||
reflect_content(tag, *this);
|
reflect_content(tag, *this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,15 +47,6 @@ class TextField : public Field {
|
|||||||
|
|
||||||
// ----------------------------------------------------------------------------- : TextStyle
|
// ----------------------------------------------------------------------------- : TextStyle
|
||||||
|
|
||||||
/// Background behind text
|
|
||||||
class TextBackground : public IntrusivePtrBase<TextBackground> {
|
|
||||||
public:
|
|
||||||
ScriptableImage image; ///< background image, stretched to text size
|
|
||||||
RealSize displacement;
|
|
||||||
private:
|
|
||||||
DECLARE_REFLECTION();
|
|
||||||
};
|
|
||||||
|
|
||||||
/// The Style for a TextField
|
/// The Style for a TextField
|
||||||
class TextStyle : public Style {
|
class TextStyle : public Style {
|
||||||
public:
|
public:
|
||||||
@@ -78,8 +69,6 @@ class TextStyle : public Style {
|
|||||||
String mask_filename; ///< Filename of the mask
|
String mask_filename; ///< Filename of the mask
|
||||||
ContourMask mask; ///< Mask to fit the text to (may be null)
|
ContourMask mask; ///< Mask to fit the text to (may be null)
|
||||||
Direction direction; ///< In what direction is text layed out?
|
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
|
// information from text rendering
|
||||||
double content_width, content_height; ///< Size of the rendered text
|
double content_width, content_height; ///< Size of the rendered text
|
||||||
int content_lines; ///< Number of rendered lines
|
int content_lines; ///< Number of rendered lines
|
||||||
|
|||||||
Reference in New Issue
Block a user