livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made inventory item colors independent from menu colors

Ansariel 2012-04-03 00:44:13 +02:00
parent b27eead1e1
commit 3482933c01
18 changed files with 161 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfolderviewitem.cpp
View File

@ -948,9 +948,14 @@ BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
void LLFolderViewItem::draw()
{
static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
// <FS:Ansariel> Make inventory selection color independent from menu color
//static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
//static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE);
//static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("MenuItemHighlightFgColor", DEFAULT_WHITE);
static LLUIColor sFgColor = LLUIColorTable::instance().getColor("InventoryItemEnabledColor", DEFAULT_WHITE);
static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("InventoryItemHighlightBgColor", DEFAULT_WHITE);
static LLUIColor sHighlightFgColor = LLUIColorTable::instance().getColor("InventoryItemHighlightFgColor", DEFAULT_WHITE);
// <FS:Ansariel> Make inventory selection color independent from menu color
static LLUIColor sFocusOutlineColor = LLUIColorTable::instance().getColor("InventoryFocusOutlineColor", DEFAULT_WHITE);
static LLUIColor sFilterBGColor = LLUIColorTable::instance().getColor("FilterBackgroundColor", DEFAULT_WHITE);
static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);

9
indra/newview/skins/default/colors.xml
View File

@ -658,6 +658,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="SchemeLightest_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/firestorm/colors.xml
View File

@ -528,6 +528,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="SchemeLightest_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/firestorm/themes/blue/colors.xml
View File

@ -255,6 +255,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LSteel" />
<color
name="InventoryItemHighlightBgColor"
reference="EmphasisColor_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/firestorm/themes/highcontrast/colors.xml
View File

@ -541,6 +541,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="SchemeLightest_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/metaharper/colors.xml
View File

@ -523,6 +523,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="SchemeLightest_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/metaharper/themes/appalachian_sky/colors.xml
View File

@ -518,6 +518,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="SchemeLightest_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/metaharper/themes/cool_ocean/colors.xml
View File

@ -536,6 +536,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="SchemeLightest_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlight/colors.xml
View File

@ -598,6 +598,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="EmphasisColor_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlight/themes/mono_teal/colors.xml
View File

@ -599,6 +599,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="EmphasisColor_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
View File

@ -598,6 +598,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="EmphasisColor_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlight/themes/original_orange/colors.xml
View File

@ -598,6 +598,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="EmphasisColor_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlight/themes/original_teal/colors.xml
View File

@ -598,6 +598,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="EmphasisColor_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlight/themes/silver_blue/colors.xml
View File

@ -600,6 +600,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="EmphasisColor_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlight/themes/silver_pink/colors.xml
View File

@ -600,6 +600,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="EmphasisColor_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlightcui/colors.xml
View File

@ -598,6 +598,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="EmphasisColor_35" />
<color
name="InventoryItemHighlightFgColor"
reference="White" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlightcui/themes/custom_dark/colors.xml
View File

@ -618,6 +618,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="White_25" />
<color
name="InventoryItemHighlightFgColor"
reference="EmphasisColor" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />

9
indra/newview/skins/starlightcui/themes/custom_light/colors.xml
View File

@ -620,6 +620,15 @@
<color
name="InventoryFocusOutlineColor"
reference="White_25" />
<color
name="InventoryItemEnabledColor"
reference="LtGray" />
<color
name="InventoryItemHighlightBgColor"
reference="White_25" />
<color
name="InventoryItemHighlightFgColor"
reference="EmphasisColor" />
<color
name="InventoryItemSuffixColor"
reference="White_25" />