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

SL-15199 Remember search results state after minimizing when pressing CTRL+F

master
Mnikolenko Productengine 2021-05-11 18:16:24 +03:00
parent ed78b2b938
commit 3392d5805e
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/llviewermenu.cpp
View File

@ -6150,6 +6150,32 @@ class LLAvatarToggleMyProfile : public view_listener_t
}
};
class LLAvatarToggleSearch : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
LLFloater* instance = LLFloaterReg::findInstance("search");
if (LLFloater::isMinimized(instance))
{
instance->setMinimized(FALSE);
instance->setFocus(TRUE);
}
else if (!LLFloater::isShown(instance))
{
LLFloaterReg::showInstance("search");
}
else if (!instance->hasFocus() && !instance->getIsChrome())
{
instance->setFocus(TRUE);
}
else
{
instance->closeFloater();
}
return true;
}
};
class LLAvatarResetSkeleton: public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@ -9280,6 +9306,7 @@ void initialize_menus()
enable.add("Avatar.EnableCall", boost::bind(&LLAvatarActions::canCall));
view_listener_t::addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse");
view_listener_t::addMenu(new LLAvatarToggleMyProfile(), "Avatar.ToggleMyProfile");
view_listener_t::addMenu(new LLAvatarToggleSearch(), "Avatar.ToggleSearch");
view_listener_t::addMenu(new LLAvatarResetSkeleton(), "Avatar.ResetSkeleton");
view_listener_t::addMenu(new LLAvatarEnableResetSkeleton(), "Avatar.EnableResetSkeleton");
view_listener_t::addMenu(new LLAvatarResetSkeletonAndAnimations(), "Avatar.ResetSkeletonAndAnimations");

3
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -487,8 +487,7 @@
function="Floater.Visible"
parameter="search" />
<menu_item_check.on_click
function="Floater.Toggle"
parameter="search" />
function="Avatar.ToggleSearch"/>
</menu_item_check>
<menu_item_separator/>
<menu_item_call