diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-16 22:17:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-16 22:17:22 +0300 |
| commit | 6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch) | |
| tree | 562e6a840c856ba8c4d35c6806020289c65d54d2 /src/gui/widgets/colorpage.cpp | |
| parent | 82ac4641828ec7387863bb18cf4493190c4cc68f (diff) | |
| download | manaverse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz manaverse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2 manaverse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz manaverse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip | |
combine font classes in one.
Diffstat (limited to 'src/gui/widgets/colorpage.cpp')
| -rw-r--r-- | src/gui/widgets/colorpage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp index a9cf4f71e..6803fbe3c 100644 --- a/src/gui/widgets/colorpage.cpp +++ b/src/gui/widgets/colorpage.cpp @@ -22,7 +22,7 @@ #include "gui/widgets/colormodel.h" -#include "gui/base/font.hpp" +#include "gui/font.h" #include "debug.h" @@ -33,7 +33,7 @@ ColorPage::ColorPage(const Widget2 *const widget, { mItemPadding = mSkin ? mSkin->getOption("itemPadding") : 1; mRowHeight = 13; - const gcn::Font *const font = getFont(); + const Font *const font = getFont(); if (font) mRowHeight = font->getHeight() + 2 * mItemPadding; if (mListModel) @@ -57,7 +57,7 @@ void ColorPage::draw(Graphics *graphics) mHighlightColor.a = static_cast<int>(mAlpha * 255.0F); graphics->setColor(mHighlightColor); updateAlpha(); - gcn::Font *const font = getFont(); + Font *const font = getFont(); const int rowHeight = getRowHeight(); const int width = mDimension.width; |