From cd8a87eea4616dd4d623d55d3245a368f92edc5a Mon Sep 17 00:00:00 2001 From: Beeks Date: Tue, 28 Sep 2010 17:40:06 -0400 Subject: [PATCH] Fixes for Gemini skin (As well as any future skin that uses a white-on-black theme). Signed-off-by: Beeks --- indra/llui/llcombobox.cpp | 5 +++-- indra/llui/llcombobox.h | 1 + indra/newview/skins/gemini/colors_base.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index e106880b8..8f33e40fc 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -75,7 +75,8 @@ LLComboBox::LLComboBox( const std::string& name, const LLRect &rect, const std:: mPrearrangeCallback( NULL ), mTextEntryCallback( NULL ), mSuppressTentative( false ), - mLabel(label) + mLabel(label), + mListColor(LLUI::sColorsGroup->getColor("ComboBoxBg")) { // Always use text box // Text label button @@ -100,7 +101,7 @@ LLComboBox::LLComboBox( const std::string& name, const LLRect &rect, const std:: mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(), &LLComboBox::onItemSelected, this, FALSE); mList->setVisible(FALSE); - mList->setBgWriteableColor( LLColor4(1,1,1,1) ); + mList->setBgWriteableColor(mListColor); mList->setCommitOnKeyboardMovement(FALSE); addChild(mList); diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 6092372e1..f28f35216 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -198,6 +198,7 @@ protected: EPreferredPosition mListPosition; LLPointer mArrowImage; std::string mLabel; + LLColor4 mListColor; private: S32 mButtonPadding; diff --git a/indra/newview/skins/gemini/colors_base.xml b/indra/newview/skins/gemini/colors_base.xml index f2df52367..529d37fea 100644 --- a/indra/newview/skins/gemini/colors_base.xml +++ b/indra/newview/skins/gemini/colors_base.xml @@ -66,7 +66,7 @@ - +