diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-08 13:47:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-08 14:39:55 +0300 |
| commit | 0975dc4cd9012b098061f0201028896d578649f8 (patch) | |
| tree | ccb3991a51ef9de47877a7d2549664d0f0ae4f79 /src/gui/widgets/progressbar.cpp | |
| parent | 4a823c0ba94c620bd0e51fc61f22c068661946cf (diff) | |
| download | manaverse-0975dc4cd9012b098061f0201028896d578649f8.tar.gz manaverse-0975dc4cd9012b098061f0201028896d578649f8.tar.bz2 manaverse-0975dc4cd9012b098061f0201028896d578649f8.tar.xz manaverse-0975dc4cd9012b098061f0201028896d578649f8.zip | |
Remove duplicate variables from some classes.
Diffstat (limited to 'src/gui/widgets/progressbar.cpp')
| -rw-r--r-- | src/gui/widgets/progressbar.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 97c29bd8c..6454cf47a 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -46,10 +46,6 @@ ProgressBar::ProgressBar(const Widget2 *const widget, float progress, mSkin(nullptr), mProgress(progress), mProgressToGo(progress), - mBackgroundColor(Theme::getProgressColor(backColor >= 0 - ? backColor : 0, mProgress)), - mBackgroundColorToGo(mBackgroundColor), - mForegroundColor2(getThemeColor(Theme::PROGRESS_BAR_OUTLINE)), mText(), mVertexes(new ImageCollection), mProgressPalette(backColor), @@ -60,6 +56,11 @@ ProgressBar::ProgressBar(const Widget2 *const widget, float progress, mSmoothColorChange(true), mRedraw(true) { + mBackgroundColor = Theme::getProgressColor(backColor >= 0 + ? backColor : 0, mProgress); + mBackgroundColorToGo = mBackgroundColor; + mForegroundColor2 = getThemeColor(Theme::PROGRESS_BAR_OUTLINE); + // The progress value is directly set at load time: if (mProgress > 1.0F || mProgress < 0.0F) mProgress = 1.0F; |