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

SL-18295 Use yellow color on all floaters' search fields when non-empty

meow-7.2.2
Mnikolenko Productengine 2022-10-05 22:40:34 +03:00
parent ad48f88d1f
commit 9b2435cbb1
5 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llfloaterpathfindinglinksets.cpp
View File

@ -44,6 +44,7 @@
#include "llpathfindinglinkset.h"
#include "llpathfindinglinksetlist.h"
#include "llpathfindingmanager.h"
#include "llsearcheditor.h"
#include "llscrolllistitem.h"
#include "llsd.h"
#include "lltextbase.h"
@ -114,17 +115,13 @@ BOOL LLFloaterPathfindingLinksets::postBuild()
{
mBeaconColor = LLUIColorTable::getInstance()->getColor("PathfindingLinksetBeaconColor");
mFilterByName = findChild<LLLineEditor>("filter_by_name");
llassert(mFilterByName != NULL);
mFilterByName->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onApplyAllFilters, this));
mFilterByName->setSelectAllonFocusReceived(true);
mFilterByName->setCommitOnFocusLost(true);
mFilterByName = getChild<LLSearchEditor>("filter_by_name");
mFilterByName->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onApplyAllFilters, this));
mFilterByName->setCommitOnFocusLost(true);
mFilterByDescription = findChild<LLLineEditor>("filter_by_description");
llassert(mFilterByDescription != NULL);
mFilterByDescription->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onApplyAllFilters, this));
mFilterByDescription->setSelectAllonFocusReceived(true);
mFilterByDescription->setCommitOnFocusLost(true);
mFilterByDescription = getChild<LLSearchEditor>("filter_by_description");
mFilterByDescription->setCommitCallback(boost::bind(&LLFloaterPathfindingLinksets::onApplyAllFilters, this));
mFilterByDescription->setCommitOnFocusLost(true);
mFilterByLinksetUse = findChild<LLComboBox>("filter_by_linkset_use");
llassert(mFilterByLinksetUse != NULL);

5
indra/newview/llfloaterpathfindinglinksets.h
View File

@ -42,6 +42,7 @@ class LLSD;
class LLTextBase;
class LLUICtrl;
class LLVector3;
class LLSearchEditor;
class LLFloaterPathfindingLinksets : public LLFloaterPathfindingObjects
{
@ -105,8 +106,8 @@ private:
LLPathfindingLinkset::ELinksetUse convertToLinksetUse(LLSD pXuiValue) const;
LLSD convertToXuiValue(LLPathfindingLinkset::ELinksetUse pLinksetUse) const;
LLLineEditor *mFilterByName;
LLLineEditor *mFilterByDescription;
LLSearchEditor *mFilterByName;
LLSearchEditor *mFilterByDescription;
LLComboBox *mFilterByLinksetUse;
LLComboBox *mEditLinksetUse;
LLScrollListItem *mEditLinksetUseUnset;

49
indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
View File

@ -82,17 +82,20 @@
width="62">
Name
</text>
<line_editor
border_style="line"
border_thickness="1"
follows="left|top"
height="20"
layout="topleft"
left_pad="0"
top_pad="-18"
max_length_chars="255"
name="filter_by_name"
width="161" />
<search_editor
follows="left|top"
search_button_visible="false"
height="20"
text_readonly_color="DkGray"
label="Objects by Name"
layout="topleft"
left_pad="0"
top_pad="-18"
name="filter_by_name"
select_on_focus="true"
width="161">
</search_editor>
<text
name="linksets_desc_label"
height="13"
@ -108,17 +111,19 @@
width="88">
Description
</text>
<line_editor
border_style="line"
border_thickness="1"
follows="left|top"
height="20"
layout="topleft"
left_pad="0"
top_pad="-17"
max_length_chars="255"
name="filter_by_description"
width="162" />
<search_editor
follows="left|top"
search_button_visible="false"
height="20"
text_readonly_color="DkGray"
label="Objects by Description"
layout="topleft"
left_pad="0"
top_pad="-17"
name="filter_by_description"
select_on_focus="true"
width="162">
</search_editor>
<combo_box
height="20"
layout="topleft"

2
indra/newview/skins/default/xui/en/widgets/filter_editor.xml
View File

@ -6,7 +6,7 @@
text_pad_left="7"
select_on_focus="true"
text_tentative_color="TextFgTentativeColor"
highlight_text_field="false"
highlight_text_field="true"
background_image="TextField_Search_Off"
background_image_disabled="TextField_Search_Disabled"
background_image_focused="TextField_Search_Active"

2
indra/newview/skins/default/xui/en/widgets/search_editor.xml
View File

@ -7,7 +7,7 @@
text_pad_right="6"
select_on_focus="true"
text_tentative_color="TextFgTentativeColor"
highlight_text_field="false"
highlight_text_field="true"
background_image="TextField_Search_Off"
background_image_disabled="TextField_Search_Disabled"
background_image_focused="TextField_Search_Active"