diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-30 15:18:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-30 15:18:19 +0300 |
| commit | aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d (patch) | |
| tree | d67adc2c432802949a4c43b6f1f476f878c8e6d4 /src/gui/theme.cpp | |
| parent | 07121956f882dce22235868a25e0c2df96fb828a (diff) | |
| download | manaplus-aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d.tar.gz manaplus-aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d.tar.bz2 manaplus-aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d.tar.xz manaplus-aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d.zip | |
Move theme progress colors enum into separate file.
Diffstat (limited to 'src/gui/theme.cpp')
| -rw-r--r-- | src/gui/theme.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index ab6255a68..477da5fb0 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -27,6 +27,7 @@ #include "configuration.h" #include "graphicsmanager.h" +#include "enums/gui/progresscolorid.h" #include "enums/gui/themecolorid.h" #include "gui/skin.h" @@ -72,7 +73,7 @@ Theme::Theme() : Palette(ThemeColorId::THEME_COLORS_END * THEME_PALETTES), mSkins(), mMinimumOpacity(-1.0F), - mProgressColors(ProgressColors(THEME_PROG_END)) + mProgressColors(ProgressColors(ProgressColorId::THEME_PROG_END)) { initDefaultThemePath(); @@ -936,7 +937,7 @@ static Palette::GradientType readColorGradient(const std::string &grad) static int readProgressType(const std::string &type) { - static const std::string colors[Theme::THEME_PROG_END] = + static const std::string colors[ProgressColorId::THEME_PROG_END] = { "HP", "HP_POISON", @@ -955,7 +956,7 @@ static int readProgressType(const std::string &type) if (type.empty()) return -1; - for (int i = 0; i < Theme::THEME_PROG_END; i++) + for (int i = 0; i < ProgressColorId::THEME_PROG_END; i++) { if (compareStrI(type, colors[i]) == 0) return i; |