From d0df8c76bcd0a5920a9ef1861d978ff52d021a02 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 16 Mar 2010 14:38:27 -0600 Subject: Fix some color issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Colors in BrowserBoxes generally didn't work. Also simplify much palette control detail. Reviewed-by: Thorbjørn Lindeijer --- src/gui/userpalette.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/userpalette.cpp') diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 71cb054c..0f30b752 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -213,9 +213,8 @@ int UserPalette::getColorTypeAt(int i) return mColors[i].type; } -void UserPalette::addColor(int type, int rgb, - Palette::GradientType grad, const std::string &text, - char c, int delay) +void UserPalette::addColor(int type, int rgb, Palette::GradientType grad, + const std::string &text, int delay) { const std::string &configName = ColorTypeNames[type]; char buffer[20]; @@ -230,7 +229,8 @@ void UserPalette::addColor(int type, int rgb, gcn::Color trueCol = rgbValue; grad = (GradientType) config.getValue(configName + "Gradient", grad); delay = (int) config.getValue(configName + "Delay", delay); - mColors[type].set(type, trueCol, grad, text, c, delay); + mColors[type].set(type, trueCol, grad, delay); + mColors[type].text = text; if (grad != STATIC) mGradVector.push_back(&mColors[type]); -- cgit v1.2.3-70-g09d2