summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-18 20:58:33 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-18 20:58:33 +0200
commitd9eea6e19d54c85a937b01f8a232e74e294a4697 (patch)
treedc1fdf1d182a2be7faec0294b0211823240162f8 /src/gui
parent64dade048df384289965157c81fb10c3eacef582 (diff)
downloadmana-d9eea6e19d54c85a937b01f8a232e74e294a4697.tar.gz
mana-d9eea6e19d54c85a937b01f8a232e74e294a4697.tar.bz2
mana-d9eea6e19d54c85a937b01f8a232e74e294a4697.tar.xz
mana-d9eea6e19d54c85a937b01f8a232e74e294a4697.zip
Restored the window background to its former glory
Well, opinions might differ about what looks better, but anyway. :P This also fixes the skin to not take the repeating middle into account when calculating the minimum width and height. And due to the larger image parts it should perform a bit better with OpenGL.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/skin.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index f6eb0d58..5881a073 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -101,16 +101,14 @@ void Skin::updateAlpha()
int Skin::getMinWidth() const
{
- return (mBorder.grid[ImageRect::UPPER_LEFT]->getWidth() +
- mBorder.grid[ImageRect::UPPER_CENTER]->getWidth()) +
- mBorder.grid[ImageRect::UPPER_RIGHT]->getWidth();
+ return mBorder.grid[ImageRect::UPPER_LEFT]->getWidth() +
+ mBorder.grid[ImageRect::UPPER_RIGHT]->getWidth();
}
int Skin::getMinHeight() const
{
- return (mBorder.grid[ImageRect::UPPER_LEFT]->getHeight() +
- mBorder.grid[ImageRect::LEFT]->getHeight()) +
- mBorder.grid[ImageRect::LOWER_LEFT]->getHeight();
+ return mBorder.grid[ImageRect::UPPER_LEFT]->getHeight() +
+ mBorder.grid[ImageRect::LOWER_LEFT]->getHeight();
}
SkinLoader::SkinLoader()