Ticket #7733: alt_list_color_v2.patch

gui/ListWidget.cpp

@@ -141 +141 @@
         }
 }
 
-void ListWidget::setList(const StringList &list) {
+void ListWidget::setList(const StringList &list, const ColorList *colors) {
         if (_editMode && _caretVisible)
                 drawCaret(true);
 
@@ -150 +150 @@
         _list = list;
         _filter.clear();
         _listIndex.clear();
+        _listColors.clear();
+
+        if (colors) {
+                _listColors = *colors;
+                assert(_listColors.size() == _dataList.size());
+        }
 
         int size = list.size();
         if (_currentPos >= size)
@@ -162 +168 @@
         scrollBarRecalc();
 }
 
-void ListWidget::append(const String &s) {
+void ListWidget::append(const String &s, ThemeEngine::FontColor color) {
+        if (_dataList.size() == _listColors.size()) {
+                // If the color list has the size of the data list, we append the color.
+                _listColors.push_back(color);
+        } else if (!_listColors.size() && color != ThemeEngine::kFontColorNormal) {
+                // If it's the first entry to use a non default color, we will fill
+                // up all other entries of the color list with the default color and
+                // add the requested color for the new entry.
+                for (uint i = 0; i < _dataList.size(); ++i)
+                        _listColors.push_back(ThemeEngine::kFontColorNormal);
+                _listColors.push_back(color);
+        }
+
         _dataList.push_back(s);
         _list.push_back(s);
 
@@ -431 +449 @@
 
                 int width;
 
+                ThemeEngine::FontColor color = ThemeEngine::kFontColorNormal;
+
+                if (!_listColors.empty()) {
+                        if (_filter.empty() || _selectedItem == -1)
+                                color = _listColors[pos];
+                        else
+                                color = _listColors[_listIndex[pos]];
+                }
+
                 if (_selectedItem == pos && _editMode) {
                         buffer = _editString;
                         adjustOffset();
                         width = _w - r.left - _hlRightPadding - _leftPadding - scrollbarW;
-                        g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + width, y + fontHeight - 2),
-                                                                        buffer, _state, Graphics::kTextAlignLeft, inverted, pad, true);
+                        g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + width, y + fontHeight - 2), buffer, _state,
+                                                                        Graphics::kTextAlignLeft, inverted, pad, true, ThemeEngine::kFontStyleBold, color);
                 } else {
                         buffer = _list[pos];
                         width = _w - r.left - scrollbarW;
-                        g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + width, y + fontHeight - 2),
-                                                                        buffer, _state, Graphics::kTextAlignLeft, inverted, pad, true);
+                        g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + width, y + fontHeight - 2), buffer, _state,
+                                                                        Graphics::kTextAlignLeft, inverted, pad, true, ThemeEngine::kFontStyleBold, color);
                 }
 
                 _textWidth[i] = width;

gui/ListWidget.h

@@ -28 +28 @@
 #include "gui/editable.h"
 #include "common/str.h"
 
+#include "gui/ThemeEngine.h"
+
 namespace GUI {
 
 class ScrollBarWidget;
@@ -51 +53 @@
 public:
         typedef Common::String String;
         typedef Common::StringList StringList;
+        typedef Common::Array<ThemeEngine::FontColor> ColorList;
 protected:
         StringList              _list;
         StringList              _dataList;
+        ColorList               _listColors;
         Common::Array<int>              _listIndex;
         bool                    _editable;
         bool                    _editMode;
@@ -87 +91 @@
 
         virtual Widget *findWidget(int x, int y);
 
-        void setList(const StringList &list);
-        void append(const String &s);
+        void setList(const StringList &list, const ColorList *colors = 0);
+        void append(const String &s, ThemeEngine::FontColor color = ThemeEngine::kFontColorNormal);
         const StringList &getList()     const                   { return _dataList; }
         int getSelected() const                                         { return (_filter.empty() || _selectedItem == -1) ? _selectedItem : _listIndex[_selectedItem]; }
         void setSelected(int item);

gui/saveload.cpp

@@ -316 +316 @@
         int curSlot = 0;
         int saveSlot = 0;
         StringList saveNames;
+        ListWidget::ColorList colors;
         for (SaveStateList::const_iterator x = _saveList.begin(); x != _saveList.end(); ++x) {
                 // Handle gaps in the list of save games
                 saveSlot = atoi(x->save_slot().c_str());
@@ -324 +325 @@
                                 SaveStateDescriptor dummySave(curSlot, "");
                                 _saveList.insert_at(curSlot, dummySave);
                                 saveNames.push_back(dummySave.description());
+                                colors.push_back(ThemeEngine::kFontColorNormal);
                                 curSlot++;
                         }
 
@@ -338 +340 @@
                 Common::String description = x->description();
                 Common::String trimmedDescription = description;
                 trimmedDescription.trim();
-                if (trimmedDescription.empty())
+                if (trimmedDescription.empty()) {
                         description = "Untitled savestate";
+                        colors.push_back(ThemeEngine::kFontColorAlternate);
+                } else {
+                        colors.push_back(ThemeEngine::kFontColorNormal);
+                }
 
                 saveNames.push_back(description);
                 curSlot++;
@@ -351 +357 @@
                 saveNames.push_back(emptyDesc);
                 SaveStateDescriptor dummySave(i, "");
                 _saveList.push_back(dummySave);
+                colors.push_back(ThemeEngine::kFontColorNormal);
         }
 
-        _list->setList(saveNames);
+        _list->setList(saveNames, &colors);
 }
 
 } // End of namespace GUI

gui/themes/default.inc

@@ -1550 +1550 @@
 "color='lightgrey' "
 "/> "
 "<text_color id='color_alternative' "
-"color='green' "
+"color='lightgrey' "
 "/> "
 "<text_color id='color_alternative_inverted' "
-"color='black' "
+"color='255,255,255' "
 "/> "
 "<text_color id='color_alternative_hover' "
-"color='green2' "
+"color='lightgrey' "
 "/> "
 "<text_color id='color_alternative_disabled' "
 "color='lightgrey' "

gui/themes/scummclassic/classic_gfx.stx

@@ -70 +70 @@
                 />
 
                 <text_color     id = 'color_alternative'
-                                color = 'green'
+                                color = 'lightgrey'
                 />
 
                 <text_color     id = 'color_alternative_inverted'
-                                color = 'black'
+                                color = '255, 255, 255'
                 />
 
                 <text_color     id = 'color_alternative_hover'
-                                color = 'green2'
+                                color = 'lightgrey'
                 />
 
                 <text_color     id = 'color_alternative_disabled'

gui/themes/scummmodern/scummmodern_gfx.stx

@@ -130 +130 @@
                 />
 
                 <text_color     id = 'color_alternative'
-                                color = 'black'
+                                color = 'darkgray'
                 />
 
                 <text_color     id = 'color_alternative_inverted'
-                                color = 'black'
+                                color = 'white'
                 />
 
                 <text_color     id = 'color_alternative_hover'
-                                color = 'bgreen'
+                                color = 'darkgray'
                 />
 
                 <text_color     id = 'color_alternative_disabled'
-                                color = '192, 192, 192'
+                                color = 'darkgray'
                 />
 
                 <text_color     id = 'color_button'