diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-27 03:30:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-27 03:30:58 +0300 |
| commit | 003043714367009efaf07015cc63a901ae2ee47c (patch) | |
| tree | f441091a46ac07419977a0dba4cfd6b5ceab667b /src/gui/widgets/progressbar.cpp | |
| parent | 916a3d76da98d078a807044c43d1a70bc146ba70 (diff) | |
| download | manaverse-003043714367009efaf07015cc63a901ae2ee47c.tar.gz manaverse-003043714367009efaf07015cc63a901ae2ee47c.tar.bz2 manaverse-003043714367009efaf07015cc63a901ae2ee47c.tar.xz manaverse-003043714367009efaf07015cc63a901ae2ee47c.zip | |
Remove default parameters from theme.
Diffstat (limited to 'src/gui/widgets/progressbar.cpp')
| -rw-r--r-- | src/gui/widgets/progressbar.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index f1889e979..0e01876f5 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -83,14 +83,23 @@ ProgressBar::ProgressBar(const Widget2 *const widget, if (theme != nullptr) { - mSkin = theme->load(skin, "progressbar.xml"); + mSkin = theme->load(skin, + "progressbar.xml", + true, + theme->getThemePath()); if (mSkin != nullptr) { setPadding(mSkin->getPadding()); mFillPadding = mSkin->getOption("fillPadding"); mFillImage = mSkin->getOption("fillImage") != 0; if (mFillImage) - theme->loadRect(mFillRect, skinFill, "progressbar_fill.xml"); + { + theme->loadRect(mFillRect, + skinFill, + "progressbar_fill.xml", + 0, + 8); + } } setHeight(2 * mPadding + getFont()->getHeight() + 2); } @@ -110,7 +119,7 @@ ProgressBar::~ProgressBar() theme->unload(mSkin); mSkin = nullptr; } - Theme::unloadRect(mFillRect); + Theme::unloadRect(mFillRect, 0, 8); delete2(mVertexes); mTextChunk.deleteImage(); } |