diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/theme.cpp | 10 | ||||
| -rw-r--r-- | src/resources/theme.h | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/resources/theme.cpp b/src/resources/theme.cpp index 96927ac8..8db05be9 100644 --- a/src/resources/theme.cpp +++ b/src/resources/theme.cpp @@ -82,8 +82,12 @@ Skin::~Skin() void Skin::updateAlpha(float minimumOpacityAllowed) { const float alpha = std::max(minimumOpacityAllowed, - config.getFloatValue("guialpha")); + config.getFloatValue("guialpha")); + setAlpha(alpha); +} +void Skin::setAlpha(float alpha) +{ for_each(mBorder.grid, mBorder.grid + 9, std::bind2nd(std::mem_fun(&Image::setAlpha), alpha)); @@ -396,6 +400,7 @@ static int readColorType(const std::string &type) { static std::string colors[] = { "TEXT", + "NPC_DIALOG_TEXT", "SHADOW", "OUTLINE", "PROGRESS_BAR", @@ -513,7 +518,8 @@ static int readProgressType(const std::string &type) "EXP", "INVY_SLOTS", "WEIGHT", - "JOB" + "JOB", + "DOWNLOAD" }; if (type.empty()) diff --git a/src/resources/theme.h b/src/resources/theme.h index b2dd10de..426f1a7e 100644 --- a/src/resources/theme.h +++ b/src/resources/theme.h @@ -89,6 +89,11 @@ class Skin */ void updateAlpha(float minimumOpacityAllowed = 0.0f); + /** + * Sets the alpha, overriding GUI opacity level. + */ + void setAlpha(float alpha); + int instances; private: @@ -121,6 +126,7 @@ class Theme : public Palette, public EventListener enum ThemePalette { TEXT, + NPC_DIALOG_TEXT, SHADOW, OUTLINE, PROGRESS_BAR, @@ -171,6 +177,7 @@ class Theme : public Palette, public EventListener PROG_INVY_SLOTS, PROG_WEIGHT, PROG_JOB, + PROG_DOWNLOAD, THEME_PROG_END }; |