summaryrefslogtreecommitdiff
path: root/src/text.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-26 14:38:25 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-26 14:38:25 +0300
commit055345145f35286b3f45ed05d5a80d118a1ab8f4 (patch)
tree6b6ab1ddcf335ad6025a752abde126cb1c2fcb8a /src/text.h
parentde328959771fcc5f992f13517ea7adacdda61550 (diff)
downloadmv-055345145f35286b3f45ed05d5a80d118a1ab8f4.tar.gz
mv-055345145f35286b3f45ed05d5a80d118a1ab8f4.tar.bz2
mv-055345145f35286b3f45ed05d5a80d118a1ab8f4.tar.xz
mv-055345145f35286b3f45ed05d5a80d118a1ab8f4.zip
Use local TextChunk in text class.
Diffstat (limited to 'src/text.h')
-rw-r--r--src/text.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/text.h b/src/text.h
index fbb36050b..845b96353 100644
--- a/src/text.h
+++ b/src/text.h
@@ -24,6 +24,8 @@
#ifndef TEXT_H
#define TEXT_H
+#include "gui/fonts/textchunk.h"
+
#include "render/graphics.h"
#include "localconsts.h"
@@ -70,7 +72,8 @@ class Text notfinal
const int xOff, const int yOff);
private:
- Font *mFont; /**< The font of the text */
+ Font *mFont; /**< The font of the text */
+ TextChunk mTextChunk;
int mX; /**< Actual x-value of left of text written. */
int mY; /**< Actual y-value of top of text written. */
int mWidth; /**< The width of the text. */
@@ -78,9 +81,10 @@ class Text notfinal
int mXOffset; /**< The offset of mX from the desired x. */
static int mInstances; /**< Instances of text. */
std::string mText; /**< The text to display. */
- const Color *mColor; /**< The color of the text. */
- const Color mOutlineColor;
+ const Color *mColor; /**< The color of the text. */
+ Color mOutlineColor;
bool mIsSpeech; /**< Is this text a speech bubble? */
+ bool mTextChanged;
protected:
static ImageRect mBubble; /**< Speech bubble graphic */