summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-04 16:24:17 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-04 16:24:17 +0300
commitcdca37e368923c0298691847eba1c394a287e52f (patch)
tree77a3b0190aae27cb8095e8817bd022cd8c9c8fb4 /src/gui/windows
parentbbc361c48389875a8a67d138bc05aad30070b916 (diff)
downloadmanaplus-cdca37e368923c0298691847eba1c394a287e52f.tar.gz
manaplus-cdca37e368923c0298691847eba1c394a287e52f.tar.bz2
manaplus-cdca37e368923c0298691847eba1c394a287e52f.tar.xz
manaplus-cdca37e368923c0298691847eba1c394a287e52f.zip
Add new color for slots progress bar in inventory.
New colors: SLOTS_BAR, SLOTS_BAR_OUTLINE.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/inventorywindow.cpp2
-rw-r--r--src/gui/windows/statuswindow.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 825c3d934..b9c89ad96 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -131,6 +131,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
mCompactMode(false)
{
mTextPopup->postInit();
+ mSlotsBar->setColor(Theme::getThemeColor(Theme::SLOTS_BAR),
+ Theme::getThemeColor(Theme::SLOTS_BAR_OUTLINE));
if (inventory)
{
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index e574c7230..5d90ad078 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -713,9 +713,9 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar,
bar->setProgress(50);
if (player_node->getDisableGameModifiers())
- bar->setColor(Theme::getThemeColor(Theme::STATUSBAR_ON));
+ bar->setBackgroundColor(Theme::getThemeColor(Theme::STATUSBAR_ON));
else
- bar->setColor(Theme::getThemeColor(Theme::STATUSBAR_OFF));
+ bar->setBackgroundColor(Theme::getThemeColor(Theme::STATUSBAR_OFF));
}
void StatusWindow::action(const gcn::ActionEvent &event)