summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/textrenderer.h81
-rw-r--r--src/gui/window.cpp1
-rw-r--r--src/text.cpp24
-rw-r--r--src/textparticle.cpp30
4 files changed, 95 insertions, 41 deletions
diff --git a/src/gui/textrenderer.h b/src/gui/textrenderer.h
new file mode 100644
index 00000000..599e85a3
--- /dev/null
+++ b/src/gui/textrenderer.h
@@ -0,0 +1,81 @@
+/*
+ * Text Renderer
+ * Copyright (C) 2009 The Mana World Development Team
+ *
+ * This file is part of Aethyra based on code from The Mana World.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef TEXT_RENDERER_H
+#define TEXT_RENDERER_H
+
+#include "graphics.h"
+#include "palette.h"
+
+/**
+ * Class for text rendering. Used by the TextParticle, the Text and FlashText
+ * objects and the Preview in the color dialog.
+ */
+class TextRenderer
+{
+ public:
+ /**
+ * Renders a specified text.
+ */
+ static inline void renderText(gcn::Graphics *graphics, const std::string&
+ text, int x, int y, gcn::Graphics::Alignment align,
+ const gcn::Color* color, gcn::Font *font, bool outline = false,
+ bool shadow = false, int alpha = 255)
+ {
+ graphics->setFont(font);
+
+ // Text shadow
+ if (shadow)
+ {
+ graphics->setColor(guiPalette->getColor(Palette::SHADOW,
+ alpha / 2));
+ if (outline)
+ {
+ graphics->drawText(text, x + 2, y + 2, align);
+ }
+ else
+ {
+ graphics->drawText(text, x + 1, y + 1, align);
+ }
+ }
+
+ if (outline) {
+/* graphics->setColor(guiPalette->getColor(Palette::OUTLINE,
+ alpha/4));
+ // TODO: Reanable when we can draw it nicely in software mode
+ graphics->drawText(text, x + 2, y + 2, align);
+ graphics->drawText(text, x + 1, y + 2, align);
+ graphics->drawText(text, x + 2, y + 1, align);*/
+
+ // Text outline
+ graphics->setColor(guiPalette->getColor(Palette::OUTLINE, alpha));
+ graphics->drawText(text, x + 1, y, align);
+ graphics->drawText(text, x - 1, y, align);
+ graphics->drawText(text, x, y + 1, align);
+ graphics->drawText(text, x, y - 1, align);
+ }
+
+ graphics->setColor(*color);
+ graphics->drawText(text, x, y, align);
+ }
+};
+
+#endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index d40ebca6..f6d23950 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -630,6 +630,7 @@ void Window::resetToDefaultSize()
{
setPosition(mDefaultX, mDefaultY);
setSize(mDefaultWidth, mDefaultHeight);
+ saveWindowState();
}
int Window::getResizeHandles(gcn::MouseEvent &event)
diff --git a/src/text.cpp b/src/text.cpp
index e5e40235..c167701a 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -26,6 +26,8 @@
#include "textmanager.h"
#include "gui/gui.h"
+#include "gui/palette.h"
+#include "gui/textrenderer.h"
int Text::mInstances = 0;
@@ -76,23 +78,9 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff)
{
graphics->setFont(boldFont);
- // Text shadow
- graphics->setColor(gcn::Color(0, 0, 0));
- graphics->drawText(mText, mX - xOff + 1, mY - yOff + 1,
- gcn::Graphics::LEFT);
-
- // Text outline
- graphics->drawText(mText, mX - xOff + 1, mY - yOff,
- gcn::Graphics::LEFT);
- graphics->drawText(mText, mX - xOff - 1, mY - yOff,
- gcn::Graphics::LEFT);
- graphics->drawText(mText, mX - xOff, mY - yOff + 1,
- gcn::Graphics::LEFT);
- graphics->drawText(mText, mX - xOff, mY - yOff - 1,
- gcn::Graphics::LEFT);
-
- graphics->setColor(mColor);
- graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT);
+ TextRenderer::renderText(graphics, mText,
+ mX - xOff, mY - yOff, gcn::Graphics::LEFT,
+ &mColor, boldFont, !mIsSpeech, true);
}
FlashText::FlashText(const std::string &text, int x, int y,
@@ -107,9 +95,7 @@ void FlashText::draw(gcn::Graphics *graphics, int xOff, int yOff)
if (mTime)
{
if ((--mTime & 4) == 0)
- {
return;
- }
}
Text::draw(graphics, xOff, yOff);
}
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 8a8948f4..a065eadd 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -22,10 +22,12 @@
#include <guichan/color.hpp>
-#include "graphics.h"
-#include "textparticle.h"
#include <SDL/SDL_ttf.h>
+#include "textparticle.h"
+
+#include "gui/textrenderer.h"
+
TextParticle::TextParticle(Map *map, const std::string &text,
int colorR, int colorG, int colorB,
gcn::Font *font, bool outline):
@@ -61,24 +63,8 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
alpha /= mFadeIn;
}
- graphics->setFont(mTextFont);
- if (mOutline)
- {
- graphics->setColor(gcn::Color(0, 0, 0, (int)(alpha/4)));
- // Text outline
- graphics->setColor(gcn::Color(0, 0, 0, (int)alpha));
- graphics->drawText(mText, screenX + 1, screenY,
- gcn::Graphics::CENTER);
-
- graphics->drawText(mText, screenX - 1, screenY,
- gcn::Graphics::CENTER);
-
- graphics->drawText(mText, screenX, screenY + 1,
- gcn::Graphics::CENTER);
-
- graphics->drawText(mText, screenX, screenY - 1,
- gcn::Graphics::CENTER);
- }
- graphics->setColor(gcn::Color(mColorR, mColorG, mColorB, (int)alpha));
- graphics->drawText(mText, screenX, screenY, gcn::Graphics::CENTER);
+ TextRenderer::renderText(graphics, mText,
+ screenX, screenY, gcn::Graphics::CENTER,
+ &gcn::Color(mColorR, mColorG, mColorB), mTextFont, mOutline, false,
+ (int) alpha);
}