summaryrefslogtreecommitdiff
path: root/src/gui/widgets/textpreview.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
commit48646db55005a0da079bd2c945875dc8225e2f86 (patch)
tree4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/gui/widgets/textpreview.cpp
parent9c12fcdfe590f34543fcecc2691b625c408f1746 (diff)
downloadManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz
ManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2
ManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz
ManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.zip
Move color into gui dir.
Diffstat (limited to 'src/gui/widgets/textpreview.cpp')
-rw-r--r--src/gui/widgets/textpreview.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 1344c647a..462ba17d9 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -89,7 +89,7 @@ void TextPreview::draw(Graphics* graphics)
if (mOpaque)
{
- graphics->setColor(gcn::Color(static_cast<int>(mBGColor->r),
+ graphics->setColor(Color(static_cast<int>(mBGColor->r),
static_cast<int>(mBGColor->g),
static_cast<int>(mBGColor->b),
static_cast<int>(mAlpha * 255.0F)));
@@ -105,7 +105,7 @@ void TextPreview::draw(Graphics* graphics)
+ 2 * ((mOutline || mShadow) ? 1 :0);
const int y = mFont->getHeight() + 1
+ 2 * ((mOutline || mShadow) ? 1 : 0);
- graphics->setColor(gcn::Color(static_cast<int>(mTextBGColor->r),
+ graphics->setColor(Color(static_cast<int>(mTextBGColor->r),
static_cast<int>(mTextBGColor->g),
static_cast<int>(mTextBGColor->b),
intAlpha));
@@ -113,9 +113,9 @@ void TextPreview::draw(Graphics* graphics)
}
}
- graphics->setColorAll(gcn::Color(mTextColor->r,
+ graphics->setColorAll(Color(mTextColor->r,
mTextColor->g, mTextColor->b, alpha),
- gcn::Color(mTextColor2->r, mTextColor2->g, mTextColor2->b, alpha));
+ Color(mTextColor2->r, mTextColor2->g, mTextColor2->b, alpha));
if (mOutline && mTextColor != mTextColor2)
graphics->setColor2(Theme::getThemeColor(Theme::OUTLINE));