From 003043714367009efaf07015cc63a901ae2ee47c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 27 Dec 2017 03:30:58 +0300 Subject: Remove default parameters from theme. --- src/gui/widgets/progressbar.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/gui/widgets/progressbar.cpp') 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(); } -- cgit v1.2.3-60-g2f50