summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-30 15:18:19 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-30 15:18:19 +0300
commitaa86dbe6a7c966a4bfa7aa6c81218fe58f0bf92d (patch)
treed67adc2c432802949a4c43b6f1f476f878c8e6d4 /src/gui/widgets
parent07121956f882dce22235868a25e0c2df96fb828a (diff)
downloadmanaplus-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/widgets')
-rw-r--r--src/gui/widgets/avatarlistbox.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index b2ee21937..5c2f0a65d 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -25,6 +25,8 @@
#include "configuration.h"
#include "graphicsvertexes.h"
+#include "enums/gui/progresscolorid.h"
+
#include "being/localplayer.h"
#include "gui/gui.h"
@@ -178,7 +180,7 @@ void AvatarListBox::draw(Graphics *graphics)
if (a->getMaxHp())
{
const int themeColor = (isPoison
- ? Theme::PROG_HP_POISON : Theme::PROG_HP);
+ ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP);
Color color = Theme::getProgressColor(
themeColor, static_cast<float>(a->getHp())
/ static_cast<float>(a->getMaxHp()));
@@ -203,7 +205,7 @@ void AvatarListBox::draw(Graphics *graphics)
}
const int themeColor = (a->getPoison()
- ? Theme::PROG_HP_POISON : Theme::PROG_HP);
+ ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP);
Color color = Theme::getProgressColor(themeColor, 1);
color.a = 80;
graphics->setColor(color);
@@ -415,7 +417,7 @@ void AvatarListBox::safeDraw(Graphics *graphics)
if (a->getMaxHp())
{
const int themeColor = (isPoison
- ? Theme::PROG_HP_POISON : Theme::PROG_HP);
+ ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP);
Color color = Theme::getProgressColor(
themeColor, static_cast<float>(a->getHp())
/ static_cast<float>(a->getMaxHp()));
@@ -440,7 +442,7 @@ void AvatarListBox::safeDraw(Graphics *graphics)
}
const int themeColor = (a->getPoison()
- ? Theme::PROG_HP_POISON : Theme::PROG_HP);
+ ? ProgressColorId::PROG_HP_POISON : ProgressColorId::PROG_HP);
Color color = Theme::getProgressColor(themeColor, 1);
color.a = 80;
graphics->setColor(color);