diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-30 16:04:27 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-30 16:04:27 +0300 |
commit | dc8422dbac2c45a082153240138d699c1bfc3b88 (patch) | |
tree | d073286b567fe45179440e678be779c8eb8c0f0e /src/gui/theme.cpp | |
parent | aa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d (diff) | |
download | manaverse-dc8422dbac2c45a082153240138d699c1bfc3b88.tar.gz manaverse-dc8422dbac2c45a082153240138d699c1bfc3b88.tar.bz2 manaverse-dc8422dbac2c45a082153240138d699c1bfc3b88.tar.xz manaverse-dc8422dbac2c45a082153240138d699c1bfc3b88.zip |
Move gradient type into separate file.
Diffstat (limited to 'src/gui/theme.cpp')
-rw-r--r-- | src/gui/theme.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 477da5fb0..d9740de3b 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -913,7 +913,7 @@ static Color readColor(const std::string &description) return Color(v); } -static Palette::GradientType readColorGradient(const std::string &grad) +static GradientTypeT readColorGradient(const std::string &grad) { static const std::string grads[] = { @@ -924,15 +924,15 @@ static Palette::GradientType readColorGradient(const std::string &grad) }; if (grad.empty()) - return Palette::STATIC; + return GradientType::STATIC; for (int i = 0; i < 4; i++) { if (compareStrI(grad, grads[i])) - return static_cast<Palette::GradientType>(i); + return static_cast<GradientTypeT>(i); } - return Palette::STATIC; + return GradientType::STATIC; } static int readProgressType(const std::string &type) @@ -1018,7 +1018,7 @@ void Theme::loadColors(std::string file) continue; const Color color = readColor(temp); - const GradientType grad = readColorGradient( + const GradientTypeT grad = readColorGradient( XML::getProperty(node, "effect", "")); mColors[paletteId * ThemeColorId::THEME_COLORS_END + type].set( type, color, grad, 10); |