Split Palette into Theme and UserPalette

Themes can now control the colors they use. Colors in the Viewport (being
names, particles, etc) can still be changed by the user. Also make
ProgressBars more easily colored. DyePalette was made more flexible in the
process.

Also fixes comparing strings of different lengths insensitively.

Reviewed-by: Thorbjørn Lindeijer

1 files changed, 7 insertions, 5 deletions

diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 76ddd7b0..da244208 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -71,6 +71,7 @@ struct SkillInfo
 
     std::string skillExp;
     float progress;
+    gcn::Color color;
 
     ~SkillInfo()
     {
@@ -146,8 +147,8 @@ public:
 
         Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
 
-        graphics->setColor(guiPalette->getColor(Palette::HIGHLIGHT,
-                (int)(mAlpha * 255.0f)));
+        graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
+                                                (int) (mAlpha * 255.0f)));
         graphics->setFont(getFont());
 
         // Draw filled rectangle around the selected list element
@@ -158,7 +159,7 @@ public:
         }
 
         // Draw the list elements
-        graphics->setColor(guiPalette->getColor(Palette::TEXT));
+        graphics->setColor(Theme::getThemeColor(Theme::TEXT));
         for (int i = 0, y = 1;
              i < model->getNumberOfElements();
              ++i, y += getRowHeight())
@@ -429,6 +430,8 @@ void SkillInfo::update()
         progress = 0.0f;
     }
 
+    color = Theme::getProgressColor(Theme::PROG_EXP, progress);
+
     if (updateVisibility)
     {
         model->updateVisibilities();
@@ -452,7 +455,6 @@ void SkillInfo::draw(Graphics *graphics, int y, int width)
     {
         gcn::Rectangle rect(33, y + 15, width - 33, 17);
 
-        ProgressBar::render(graphics, rect, gcn::Color(143, 192, 211),
-                            progress, skillExp);
+        ProgressBar::render(graphics, rect, color, progress, skillExp);
     }
 }