Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for Gemini skin (As well as any future skin that uses a white-on-black theme).

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-28 17:40:06 -04:00
parent b1bc45ac42
commit cd8a87eea4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/llcombobox.cpp
View File

@@ -75,7 +75,8 @@ LLComboBox::LLComboBox( const std::string& name, const LLRect &rect, const std::
mPrearrangeCallback( NULL ), mPrearrangeCallback( NULL ),
mTextEntryCallback( NULL ), mTextEntryCallback( NULL ),
mSuppressTentative( false ), mSuppressTentative( false ),
mLabel(label) mLabel(label),
mListColor(LLUI::sColorsGroup->getColor("ComboBoxBg"))
{ {
// Always use text box // Always use text box
// Text label button // 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(), mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(),
&LLComboBox::onItemSelected, this, FALSE); &LLComboBox::onItemSelected, this, FALSE);
mList->setVisible(FALSE); mList->setVisible(FALSE);
mList->setBgWriteableColor( LLColor4(1,1,1,1) ); mList->setBgWriteableColor(mListColor);
mList->setCommitOnKeyboardMovement(FALSE); mList->setCommitOnKeyboardMovement(FALSE);
addChild(mList); addChild(mList);

1
indra/llui/llcombobox.h
View File

@@ -198,6 +198,7 @@ protected:
EPreferredPosition mListPosition; EPreferredPosition mListPosition;
LLPointer<LLUIImage> mArrowImage; LLPointer<LLUIImage> mArrowImage;
std::string mLabel; std::string mLabel;
LLColor4 mListColor;
private: private:
S32 mButtonPadding; S32 mButtonPadding;

2
indra/newview/skins/gemini/colors_base.xml
View File

@@ -66,7 +66,7 @@
<ScrollBgWriteableColor value="33, 33, 33, 80" /> <ScrollBgWriteableColor value="33, 33, 33, 80" />
<ScrollBGStripeColor value="100, 100, 100, 25" /> <ScrollBGStripeColor value="100, 100, 100, 25" />
<ScrollDisabledColor value="33, 33, 33, 204" /> <ScrollDisabledColor value="33, 33, 33, 204" />
<ScrollSelectedBGColor value="222, 222, 222, 150" /> <ScrollSelectedBGColor value="33, 33, 33, 204" />
<ScrollSelectedFGColor value="255, 255, 255, 255" /> <!-- Text color --> <ScrollSelectedFGColor value="255, 255, 255, 255" /> <!-- Text color -->
<ScrollUnselectedColor value="222, 222, 222, 150" /> <!-- Text color --> <ScrollUnselectedColor value="222, 222, 222, 150" /> <!-- Text color -->
<ScrollHighlightedColor value="222, 222, 222, 80" /> <!-- Hover color --> <ScrollHighlightedColor value="222, 222, 222, 80" /> <!-- Hover color -->