From a2c2444d9eb4b43fb73339ae1cc3b7464f33409e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 5 May 2013 23:56:48 +0300 Subject: add outline color to listbox. --- src/gui/widgets/listbox.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/gui/widgets/listbox.cpp') diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 2e84bb1a2..d2b7eb712 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -45,7 +45,9 @@ ListBox::ListBox(const Widget2 *const widget, gcn::ListBox(listModel), Widget2(widget), mHighlightColor(getThemeColor(Theme::HIGHLIGHT)), + mForegroundColor2(getThemeColor(Theme::LISTBOX_OUTLINE)), mForegroundSelectedColor(getThemeColor(Theme::LISTBOX_SELECTED)), + mForegroundSelectedColor2(getThemeColor(Theme::LISTBOX_SELECTED_OUTLINE)), mDistributeMousePressed(true), mOldSelected(-1), mPadding(0), @@ -88,6 +90,7 @@ void ListBox::draw(gcn::Graphics *graphics) BLOCK_START("ListBox::draw") updateAlpha(); + Graphics *const g = static_cast(graphics); mHighlightColor.a = static_cast(mAlpha * 255.0f); graphics->setColor(mHighlightColor); @@ -105,12 +108,13 @@ void ListBox::draw(gcn::Graphics *graphics) const int sel = getSelected(); if (sel >= 0) { - graphics->setColor(mForegroundSelectedColor); + g->setColorAll(mForegroundSelectedColor, + mForegroundSelectedColor2); font->drawString(graphics, mListModel->getElementAt(sel), mPadding, sel * height + mPadding); } // Draw the list elements - graphics->setColor(mForegroundColor); + g->setColorAll(mForegroundColor, mForegroundColor2); for (int i = 0, y = 0; i < mListModel->getNumberOfElements(); ++i, y += height) { -- cgit v1.2.3-70-g09d2