diff options
| -rw-r--r-- | src/gui/widgets/progressbar.cpp | 10 | ||||
| -rw-r--r-- | src/gui/widgets/progressbar.h | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index caaec19b0..f76c9610e 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -47,17 +47,17 @@ ProgressBar::ProgressBar(const Widget2 *const widget, float progress, mSkin(nullptr), mProgress(progress), mProgressToGo(progress), - mSmoothProgress(true), - mProgressPalette(color), mColor(Theme::getProgressColor(color >= 0 ? color : 0, mProgress)), mColorToGo(mColor), - mSmoothColorChange(true), + mOutlineColor(getThemeColor(Theme::OUTLINE)), mText(), mVertexes(new ImageCollection), - mRedraw(true), + mProgressPalette(color), mPadding(2), mFillPadding(3), - mOutlineColor(getThemeColor(Theme::OUTLINE)) + mSmoothProgress(true), + mSmoothColorChange(true), + mRedraw(true) { // The progress value is directly set at load time: if (mProgress > 1.0f || mProgress < 0.0f) diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index c1cd2afb7..1807324ed 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -141,24 +141,24 @@ class ProgressBar final : public gcn::Widget, Skin *mSkin; float mProgress; float mProgressToGo; - bool mSmoothProgress; - int mProgressPalette; /** < Entry in ProgressPalette or -1 for none. */ gcn::Color mColor; gcn::Color mColorToGo; - bool mSmoothColorChange; + gcn::Color mOutlineColor; std::string mText; ImageCollection *mVertexes; - bool mRedraw; + int mProgressPalette; /** < Entry in ProgressPalette or -1 for none. */ unsigned int mPadding; unsigned int mFillPadding; - gcn::Color mOutlineColor; static int mInstances; static float mAlpha; - static const gcn::Color TEXT_COLOR; + + bool mSmoothProgress; + bool mSmoothColorChange; + bool mRedraw; }; #endif // GUI_WIDGETS_PROGRESSBAR_H |