Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Testicular Slingshot
Alchemy Viewer
Commits
518d4bb6
Commit
518d4bb6
authored
Feb 07, 2020
by
Rye Mutt
🍞
Browse files
Merge branch 'fix-pref-search' into 'master'
Fixed preferences search and some typos. See merge request
alchemy/alchemy!4
parents
f4c64f49
f60f76b8
Changes
5
Hide whitespace changes
Inline
Side-by-side
indra/llui/llsearchablecontrol.h
View file @
518d4bb6
...
...
@@ -35,10 +35,10 @@ namespace ll
{
class
SearchableControl
{
mutable
bool
mIsHighlighed
;
mutable
bool
mIsHighligh
t
ed
;
public:
SearchableControl
()
:
mIsHighlighed
(
false
)
:
mIsHighligh
t
ed
(
false
)
{
}
virtual
~
SearchableControl
()
=
default
;
...
...
@@ -50,11 +50,11 @@ namespace ll
void
setHighlighted
(
bool
aVal
)
const
{
mIsHighlighed
=
aVal
;
mIsHighligh
t
ed
=
aVal
;
onSetHighlight
(
);
}
bool
getHighlighted
(
)
const
{
return
mIsHighlighed
;
}
{
return
mIsHighligh
t
ed
;
}
std
::
string
getSearchText
()
const
{
return
_getSearchText
();
}
...
...
indra/newview/llfloaterpreference.cpp
View file @
518d4bb6
...
...
@@ -3082,18 +3082,18 @@ void LLFloaterPreference::disableUnavailableSettings()
void
LLFloaterPreference
::
onUpdateFilterTerm
(
bool
force
)
{
LLWString
seachValue
=
utf8str_to_wstring
(
mFilterEdit
->
getValue
()
);
LLWStringUtil
::
toLower
(
seachValue
);
LLWString
sea
r
chValue
=
utf8str_to_wstring
(
mFilterEdit
->
getValue
()
);
LLWStringUtil
::
toLower
(
sea
r
chValue
);
if
(
!
mSearchData
||
(
mSearchData
->
mLastFilter
==
seachValue
&&
!
force
))
if
(
!
mSearchData
||
(
mSearchData
->
mLastFilter
==
sea
r
chValue
&&
!
force
))
return
;
mSearchData
->
mLastFilter
=
seachValue
;
mSearchData
->
mLastFilter
=
sea
r
chValue
;
if
(
!
mSearchData
->
mRootTab
)
return
;
mSearchData
->
mRootTab
->
high
t
lightAndHide
(
seachValue
);
mSearchData
->
mRootTab
->
highlightAndHide
(
sea
r
chValue
);
LLTabContainer
*
pRoot
=
getChild
<
LLTabContainer
>
(
"pref core"
);
if
(
pRoot
)
pRoot
->
selectFirstTab
();
...
...
indra/newview/llsearchableui.cpp
View file @
518d4bb6
...
...
@@ -38,7 +38,7 @@ void ll::prefs::SearchableItem::setNotHighlighted()
mCtrl
->
setHighlighted
(
false
);
}
bool
ll
::
prefs
::
SearchableItem
::
high
t
lightAndHide
(
LLWString
const
&
aFilter
)
bool
ll
::
prefs
::
SearchableItem
::
highlightAndHide
(
LLWString
const
&
aFilter
)
{
if
(
mCtrl
->
getHighlighted
()
)
return
true
;
...
...
@@ -65,38 +65,33 @@ bool ll::prefs::SearchableItem::hightlightAndHide( LLWString const &aFilter )
ll
::
prefs
::
PanelData
::~
PanelData
()
{}
bool
ll
::
prefs
::
PanelData
::
high
t
lightAndHide
(
LLWString
const
&
aFilter
)
bool
ll
::
prefs
::
PanelData
::
highlightAndHide
(
LLWString
const
&
aFilter
)
{
for
(
auto
&
itr
:
mChildren
)
itr
->
setNotHighlighted
(
);
if
(
aFilter
.
empty
())
{
return
true
;
}
itr
->
setNotHighlighted
();
bool
bVisible
(
false
);
bool
bVisible
(
mChildren
.
size
()
==
0
&&
aFilter
.
empty
()
);
for
(
auto
&
itr
:
mChildren
)
bVisible
|=
itr
->
high
t
lightAndHide
(
aFilter
);
bVisible
|=
itr
->
highlightAndHide
(
aFilter
);
for
(
auto
&
itr
:
mChildPanel
)
bVisible
|=
itr
->
high
t
lightAndHide
(
aFilter
);
bVisible
|=
itr
->
highlightAndHide
(
aFilter
);
return
bVisible
;
}
bool
ll
::
prefs
::
TabContainerData
::
high
t
lightAndHide
(
LLWString
const
&
aFilter
)
bool
ll
::
prefs
::
TabContainerData
::
highlightAndHide
(
LLWString
const
&
aFilter
)
{
for
(
auto
&
itr
:
mChildren
)
itr
->
setNotHighlighted
(
);
bool
bVisible
(
false
);
for
(
auto
&
itr
:
mChildren
)
bVisible
|=
itr
->
high
t
lightAndHide
(
aFilter
);
bVisible
|=
itr
->
highlightAndHide
(
aFilter
);
for
(
auto
&
itr
:
mChildPanel
)
{
bool
bPanelVisible
=
itr
->
high
t
lightAndHide
(
aFilter
);
bool
bPanelVisible
=
itr
->
highlightAndHide
(
aFilter
);
if
(
itr
->
mPanel
)
mTabContainer
->
setTabVisibility
(
itr
->
mPanel
,
bPanelVisible
);
bVisible
|=
bPanelVisible
;
...
...
@@ -125,7 +120,7 @@ void ll::statusbar::SearchableItem::setNotHighlighted( )
}
}
bool
ll
::
statusbar
::
SearchableItem
::
high
t
lightAndHide
(
LLWString
const
&
aFilter
,
bool
hide
)
bool
ll
::
statusbar
::
SearchableItem
::
highlightAndHide
(
LLWString
const
&
aFilter
,
bool
hide
)
{
if
((
mMenu
&&
!
mMenu
->
getVisible
()
&&
!
mWasHiddenBySearch
)
||
dynamic_cast
<
LLMenuItemTearOffGL
*>
(
mMenu
))
return
false
;
...
...
@@ -149,7 +144,7 @@ bool ll::statusbar::SearchableItem::hightlightAndHide(LLWString const &aFilter,
bool
bVisible
(
false
);
for
(
auto
&
itr
:
mChildren
)
bVisible
|=
itr
->
high
t
lightAndHide
(
aFilter
,
!
bHighlighted
);
bVisible
|=
itr
->
highlightAndHide
(
aFilter
,
!
bHighlighted
);
if
(
mCtrl
&&
!
bVisible
&&
!
bHighlighted
)
{
...
...
indra/newview/llsearchableui.h
View file @
518d4bb6
...
...
@@ -60,7 +60,7 @@ namespace ll
virtual
~
SearchableItem
();
void
setNotHighlighted
();
virtual
bool
high
t
lightAndHide
(
LLWString
const
&
aFilter
);
virtual
bool
highlightAndHide
(
LLWString
const
&
aFilter
);
};
struct
PanelData
...
...
@@ -73,13 +73,13 @@ namespace ll
virtual
~
PanelData
();
virtual
bool
high
t
lightAndHide
(
LLWString
const
&
aFilter
);
virtual
bool
highlightAndHide
(
LLWString
const
&
aFilter
);
};
struct
TabContainerData
:
public
PanelData
{
LLTabContainer
*
mTabContainer
;
virtual
bool
high
t
lightAndHide
(
LLWString
const
&
aFilter
);
virtual
bool
highlightAndHide
(
LLWString
const
&
aFilter
);
};
struct
SearchData
...
...
@@ -107,7 +107,7 @@ namespace ll
SearchableItem
();
void
setNotHighlighted
(
);
bool
high
t
lightAndHide
(
LLWString
const
&
aFilter
,
bool
hide
=
true
);
bool
highlightAndHide
(
LLWString
const
&
aFilter
,
bool
hide
=
true
);
};
struct
SearchData
...
...
indra/newview/llstatusbar.cpp
View file @
518d4bb6
...
...
@@ -706,7 +706,7 @@ void LLStatusBar::onUpdateFilterTerm()
mSearchData
->
mLastFilter
=
searchValue
;
mSearchData
->
mRootMenu
->
high
t
lightAndHide
(
searchValue
);
mSearchData
->
mRootMenu
->
highlightAndHide
(
searchValue
);
gMenuBarView
->
needsArrange
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment