From aaddd74d15f8701283623b45a63262084055c291 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 21 Oct 2012 16:47:58 +0300 Subject: Extend playerbox theming. New theme options: offsetX - offset for player by x. Default -16 offsetY - offset for player by y. Default -32 frameSize - frame size. Default 2 --- data/graphics/gui/charcreate_playerbox.xml | 32 ++++++++++++++------------ data/graphics/gui/equipment_playerbox.xml | 32 ++++++++++++++------------ data/graphics/gui/playerbox.xml | 34 +++++++++++++++------------- data/themes/jewelry/playerbox.xml | 36 +++++++++++++++++------------- src/gui/widgets/playerbox.cpp | 17 ++++++++++---- src/gui/widgets/playerbox.h | 2 ++ 6 files changed, 90 insertions(+), 63 deletions(-) diff --git a/data/graphics/gui/charcreate_playerbox.xml b/data/graphics/gui/charcreate_playerbox.xml index 7a8b829f8..72ed13a7c 100644 --- a/data/graphics/gui/charcreate_playerbox.xml +++ b/data/graphics/gui/charcreate_playerbox.xml @@ -1,18 +1,22 @@ - - - - - + + + + + + + + + + + + diff --git a/data/graphics/gui/equipment_playerbox.xml b/data/graphics/gui/equipment_playerbox.xml index 7a8b829f8..72ed13a7c 100644 --- a/data/graphics/gui/equipment_playerbox.xml +++ b/data/graphics/gui/equipment_playerbox.xml @@ -1,18 +1,22 @@ - - - - - + + + + + + + + + + + + diff --git a/data/graphics/gui/playerbox.xml b/data/graphics/gui/playerbox.xml index 5fc994df5..7e8a91482 100644 --- a/data/graphics/gui/playerbox.xml +++ b/data/graphics/gui/playerbox.xml @@ -1,19 +1,23 @@ - - diff --git a/data/themes/jewelry/playerbox.xml b/data/themes/jewelry/playerbox.xml index 1e18e42fe..8b9b1b412 100644 --- a/data/themes/jewelry/playerbox.xml +++ b/data/themes/jewelry/playerbox.xml @@ -1,19 +1,23 @@ - - diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index 7fbe68f7f..747cd91ab 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -39,7 +39,9 @@ PlayerBox::PlayerBox(Being *const being, const std::string &skin) : mBeing(being), mAlpha(1.0), mSkin(nullptr), - mDrawBackground(false) + mDrawBackground(false), + mOffsetX(-16), + mOffsetY(-32) { init(skin); } @@ -49,7 +51,9 @@ PlayerBox::PlayerBox(std::string skin) : mBeing(nullptr), mAlpha(1.0), mSkin(nullptr), - mDrawBackground(false) + mDrawBackground(false), + mOffsetX(-16), + mOffsetY(-32) { init(skin); } @@ -77,7 +81,12 @@ void PlayerBox::init(std::string skin) mSkin = Theme::instance()->loadSkinRect(mBackground, skin, "playerbox_background.xml"); if (mSkin) + { mDrawBackground = (mSkin->getOption("drawbackground") != 0); + mOffsetX = mSkin->getOption("offsetX", -16); + mOffsetY = mSkin->getOption("offsetY", -32); + mFrameSize = mSkin->getOption("frameSize", 2); + } } else { @@ -92,8 +101,8 @@ void PlayerBox::draw(gcn::Graphics *graphics) { // Draw character const int bs = getFrameSize(); - const int x = getWidth() / 2 + bs - 16; - const int y = getHeight() - bs - 32; + const int x = getWidth() / 2 + bs + mOffsetX; + const int y = getHeight() - bs + mOffsetY; mBeing->drawSpriteAt(static_cast(graphics), x, y); } diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index 90ef929af..d7729f5be 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -87,6 +87,8 @@ class PlayerBox final : public Widget2, ImageRect mBackground; Skin *mSkin; bool mDrawBackground; + int mOffsetX; + int mOffsetY; }; #endif -- cgit v1.2.3-70-g09d2