summaryrefslogtreecommitdiff
path: root/src/gui/widgets/label.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
commit6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch)
tree562e6a840c856ba8c4d35c6806020289c65d54d2 /src/gui/widgets/label.cpp
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
plus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
plus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
plus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/gui/widgets/label.cpp')
-rw-r--r--src/gui/widgets/label.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index b2b709052..6cc94cc3d 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -21,7 +21,7 @@
#include "gui/widgets/label.h"
-#include "gui/base/font.hpp"
+#include "gui/font.h"
#include "debug.h"
@@ -82,7 +82,7 @@ void Label::draw(Graphics* graphics)
int textX;
const gcn::Rectangle &rect = mDimension;
const int textY = rect.height / 2 - getFont()->getHeight() / 2;
- gcn::Font *const font = getFont();
+ Font *const font = getFont();
switch (mAlignment)
{
@@ -108,7 +108,7 @@ void Label::draw(Graphics* graphics)
void Label::adjustSize()
{
- const gcn::Font *const font = getFont();
+ const Font *const font = getFont();
const int pad2 = 2 * mPadding;
setWidth(font->getWidth(mCaption) + pad2);
setHeight(font->getHeight() + pad2);
@@ -129,7 +129,7 @@ void Label::setForegroundColorAll(const gcn::Color &color1,
void Label::resizeTo(const int maxSize, const int minSize)
{
- const gcn::Font *const font = getFont();
+ const Font *const font = getFont();
const int pad2 = 2 * mPadding;
setHeight(font->getHeight() + pad2);