diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-18 21:05:07 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-18 21:05:07 +0200 |
| commit | 38a4f3b3c4bef27496f88c6e8e6a32d978c29400 (patch) | |
| tree | 0543fdca8ae2447f204b8a02fb6961dad9259335 /src | |
| parent | 5e09f904d48f1b54f44763f8cb13914bddaafc86 (diff) | |
| parent | d9eea6e19d54c85a937b01f8a232e74e294a4697 (diff) | |
| download | mana-client-38a4f3b3c4bef27496f88c6e8e6a32d978c29400.tar.gz mana-client-38a4f3b3c4bef27496f88c6e8e6a32d978c29400.tar.bz2 mana-client-38a4f3b3c4bef27496f88c6e8e6a32d978c29400.tar.xz mana-client-38a4f3b3c4bef27496f88c6e8e6a32d978c29400.zip | |
Merge branch '0.0.29'
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/skin.cpp | 10 |
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() |