Fixes preferences search highlight color by reverting to the old behavior of Bg and Font color being linked.
parent
3c9cd68cc5
commit
1270950f2e
|
|
@ -901,7 +901,10 @@ void LLButton::draw()
|
|||
|
||||
// Highlight if needed
|
||||
if( ll::ui::SearchableControl::getHighlighted() )
|
||||
label_color = ll::ui::SearchableControl::getHighlightFontColor();
|
||||
// <FS> [FIRE-35405] Fix for search highlight color until font color picker is added
|
||||
//label_color = ll::ui::SearchableControl::getHighlightFontColor();
|
||||
label_color = ll::ui::SearchableControl::getHighlightBgColor();
|
||||
// </FS>
|
||||
|
||||
// overlay with keyboard focus border
|
||||
if (hasFocus())
|
||||
|
|
|
|||
|
|
@ -529,7 +529,10 @@ void LLMenuItemGL::draw( void )
|
|||
|
||||
// Highlight if needed
|
||||
if( ll::ui::SearchableControl::getHighlighted() )
|
||||
color = ll::ui::SearchableControl::getHighlightFontColor();
|
||||
// <FS> [FIRE-35405] Fix for search highlight color until font color picker is added
|
||||
//color = ll::ui::SearchableControl::getHighlightFontColor();
|
||||
color = ll::ui::SearchableControl::getHighlightBgColor();
|
||||
// </FS>
|
||||
|
||||
// Draw the text on top.
|
||||
if (mBriefItem)
|
||||
|
|
|
|||
|
|
@ -1839,10 +1839,10 @@
|
|||
width="44">
|
||||
<color_swatch.init_callback
|
||||
function="Pref.getUIColor"
|
||||
parameter="SearchableControlHighlightColor" />
|
||||
parameter="SearchableControlHighlightBgColor" />
|
||||
<color_swatch.commit_callback
|
||||
function="Pref.applyUIColor"
|
||||
parameter="SearchableControlHighlightColor" />
|
||||
parameter="SearchableControlHighlightBgColor" />
|
||||
</color_swatch>
|
||||
|
||||
<text
|
||||
|
|
|
|||
Loading…
Reference in New Issue