diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-12-03 21:28:50 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-12-03 21:28:50 +0300 |
commit | bbc361c48389875a8a67d138bc05aad30070b916 (patch) | |
tree | 8d2fcdf36e953b54904357b0a14a76bb469c2337 /src/gui/widgets | |
parent | 54a54eb5317650fc3306d200517bcc48bb7f1d9c (diff) | |
download | manaplus-bbc361c48389875a8a67d138bc05aad30070b916.tar.gz manaplus-bbc361c48389875a8a67d138bc05aad30070b916.tar.bz2 manaplus-bbc361c48389875a8a67d138bc05aad30070b916.tar.xz manaplus-bbc361c48389875a8a67d138bc05aad30070b916.zip |
add UPDATE color into progress bar colors.
New progress color: UPDATE.
also removed DEFAULT progress color.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/progressbar.cpp | 6 | ||||
-rw-r--r-- | src/gui/widgets/progressbar.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index de30feeef..51faed2ae 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -37,19 +37,19 @@ float ProgressBar::mAlpha = 1.0; ProgressBar::ProgressBar(const Widget2 *const widget, float progress, const int width, const int height, - const int color): + const int backColor): gcn::Widget(), Widget2(widget), gcn::WidgetListener(), mSkin(nullptr), mProgress(progress), mProgressToGo(progress), - mColor(Theme::getProgressColor(color >= 0 ? color : 0, mProgress)), + mColor(Theme::getProgressColor(backColor >= 0 ? backColor : 0, mProgress)), mColorToGo(mColor), mOutlineColor(getThemeColor(Theme::OUTLINE)), mText(), mVertexes(new ImageCollection), - mProgressPalette(color), + mProgressPalette(backColor), mPadding(2), mFillPadding(3), mSmoothProgress(true), diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index fa05e7bd3..160d3f4a2 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -50,8 +50,8 @@ class ProgressBar final : public gcn::Widget, * Constructor, initializes the progress with the given value. */ ProgressBar(const Widget2 *const widget, float progress, - const int width = 40, const int height = 7, - const int color = -1); + const int width, const int height, + const int backColor); A_DELETE_COPY(ProgressBar) |