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

FIRE-32991: Make history button in stream title window a toggle

meow-7.2.2
Ansariel 2023-05-31 15:00:15 +02:00
parent 692a86e7cf
commit e654135881
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/fsfloaterstreamtitle.cpp
View File

@ -183,25 +183,35 @@ BOOL FSFloaterStreamTitle::postBuild()
mUpdateConnection = instance.setUpdateCallback([this](std::string_view streamtitle) { updateStreamTitle(streamtitle); });
updateStreamTitle(instance.getCurrentStreamTitle());
mHistoryBtn->setCommitCallback(std::bind(&FSFloaterStreamTitle::openHistory, this));
mHistoryBtn->setCommitCallback(std::bind(&FSFloaterStreamTitle::toggleHistory, this));
mHistoryBtn->setIsToggledCallback([](LLUICtrl*, const LLSD&) { return LLFloaterReg::instanceVisible("fs_streamtitlehistory"); });
setVisibleCallback(boost::bind(&FSFloaterStreamTitle::closeHistory, this));
return TRUE;
}
void FSFloaterStreamTitle::openHistory() noexcept
void FSFloaterStreamTitle::toggleHistory() noexcept
{
LLFloater* root_floater = gFloaterView->getParentFloater(this);
FSFloaterStreamTitleHistory* history_floater = LLFloaterReg::showTypedInstance<FSFloaterStreamTitleHistory>("fs_streamtitlehistory");
FSFloaterStreamTitleHistory* history_floater = LLFloaterReg::findTypedInstance<FSFloaterStreamTitleHistory>("fs_streamtitlehistory");
if (root_floater)
if (!history_floater)
{
root_floater->addDependentFloater(history_floater);
history_floater->setOwnerOrigin(root_floater);
history_floater = LLFloaterReg::showTypedInstance<FSFloaterStreamTitleHistory>("fs_streamtitlehistory");
if (root_floater && history_floater)
{
root_floater->addDependentFloater(history_floater);
history_floater->setOwnerOrigin(root_floater);
mHistory = history_floater->getHandle();
}
}
else
{
closeHistory();
}
mHistory = history_floater->getHandle();
}
void FSFloaterStreamTitle::closeHistory() noexcept

2
indra/newview/fsfloaterstreamtitle.h
View File

@ -108,7 +108,7 @@ private:
BOOL tick() override;
void updateStreamTitle(std::string_view streamtitle) noexcept;
void openHistory() noexcept;
void toggleHistory() noexcept;
void closeHistory() noexcept;
void checkTitleWidth() noexcept;