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, 22 insertions, 4 deletions

diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 99a8c36a..028658ab 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -41,11 +41,10 @@ float ProgressBar::mAlpha = 1.0;
 
 ProgressBar::ProgressBar(float progress,
                          int width, int height,
-                         const gcn::Color &color):
+                         int color):
     gcn::Widget(),
     mSmoothProgress(true),
-    mColor(color),
-    mColorToGo(color),
+    mProgressPalette(color),
     mSmoothColorChange(true)
 {
     // The progress value is directly set at load time:
@@ -54,6 +53,9 @@ ProgressBar::ProgressBar(float progress,
 
     mProgress = mProgressToGo = progress;
 
+    mColor = mColorToGo = Theme::getProgressColor(color >= 0 ? color : 0,
+                                                  mProgress);
+
     setSize(width, height);
 
     if (mInstances == 0)
@@ -156,6 +158,22 @@ void ProgressBar::setProgress(float progress)
 
     if (!mSmoothProgress)
         mProgress = p;
+
+    if (mProgressPalette >= 0)
+    {
+        mColorToGo = Theme::getProgressColor(mProgressPalette, progress);
+    }
+}
+
+void ProgressBar::setProgressPalette(int progressPalette)
+{
+    int oldPalette = mProgressPalette;
+    mProgressPalette = progressPalette;
+
+    if (mProgressPalette != oldPalette && mProgressPalette >= 0)
+    {
+        mColorToGo = Theme::getProgressColor(mProgressPalette, mProgressToGo);
+    }
 }
 
 void ProgressBar::setColor(const gcn::Color &color)
@@ -192,7 +210,7 @@ void ProgressBar::render(Graphics *graphics, const gcn::Rectangle &area,
 
         TextRenderer::renderText(graphics, text, textX, textY,
                                  gcn::Graphics::CENTER,
-                                 guiPalette->getColor(Palette::PROGRESS_BAR),
+                                 Theme::getThemeColor(Theme::PROGRESS_BAR),
                                  gui->getFont(), true, false);
     }