summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-26 12:49:29 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-26 12:49:29 +0300
commit476a73f07d4dae7f0cc3c79a44fbd2c2f8c4bf5f (patch)
tree39f34eebd59cfb07fb0375db2f34b9831744cce3
parent45f77fd60f71322b288a4497dea5b583b2692613 (diff)
downloadmanaplus-476a73f07d4dae7f0cc3c79a44fbd2c2f8c4bf5f.tar.gz
manaplus-476a73f07d4dae7f0cc3c79a44fbd2c2f8c4bf5f.tar.bz2
manaplus-476a73f07d4dae7f0cc3c79a44fbd2c2f8c4bf5f.tar.xz
manaplus-476a73f07d4dae7f0cc3c79a44fbd2c2f8c4bf5f.zip
Change type for mCaptionAlign in Window class.
-rw-r--r--src/gui/widgets/window.cpp5
-rw-r--r--src/gui/widgets/window.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index f11db3be3..8733bb737 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -128,7 +128,8 @@ Window::Window(const std::string &caption, const bool modal,
mCaptionOffsetY = getOption("captionoffsety");
if (!mCaptionOffsetY)
mCaptionOffsetY = 5;
- mCaptionAlign = getOption("captionalign");
+ mCaptionAlign = static_cast<gcn::Graphics::Alignment>(
+ getOption("captionalign"));
if (mCaptionAlign < gcn::Graphics::LEFT
|| mCaptionAlign > gcn::Graphics::RIGHT)
{
@@ -289,7 +290,7 @@ void Window::draw(gcn::Graphics *graphics)
{
g->setColorAll(mForegroundColor, mForegroundColor2);
int x;
- switch (static_cast<gcn::Graphics::Alignment>(mCaptionAlign))
+ switch (mCaptionAlign)
{
case Graphics::LEFT:
default:
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 40270673a..79d7053b0 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -494,7 +494,7 @@ class Window : public gcn::Window,
ImageCollection *mVertexes;
int mCaptionOffsetX;
int mCaptionOffsetY;
- int mCaptionAlign;
+ gcn::Graphics::Alignment mCaptionAlign;
int mTitlePadding;
int mGripPadding;
int mResizeHandles;