Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up spell check entries properly, yikes.

Browse Source 
Thanks for pointing this out, Torric!
This commit is contained in:
Liru Færs
2019-12-28 04:14:32 -05:00
parent 09926d12bb
commit 3fec94bb94
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llui/lllineeditor.cpp
View File

@@ -3014,6 +3014,9 @@ void LLLineEditor::showContextMenu(S32 x, S32 y)
if (!mReadOnly && mSpellCheckable) if (!mReadOnly && mSpellCheckable)
{ {
constexpr auto spell_sep = "Spell Check Sep"; constexpr auto spell_sep = "Spell Check Sep";
// Remove everything after the separator if we added it, because menus don't autodie yet.
for (auto menu_end = menu->end(), menu_it = menu->find(menu->findChild<LLMenuItemGL>(spell_sep)); menu_it != menu_end; ++menu_it)
menu->removeChild(*menu_it);
menu->addSeparator(spell_sep); menu->addSeparator(spell_sep);
// search for word matches // search for word matches
@@ -3036,15 +3039,8 @@ void LLLineEditor::showContextMenu(S32 x, S32 y)
} }
} }
const std::string showstr("Show Misspellings"), hidestr("Hide Misspellings");
bool show = !glggHunSpell->getSpellCheckHighlight(); bool show = !glggHunSpell->getSpellCheckHighlight();
auto word = show ? showstr : hidestr; menu->addChild(new LLMenuItemCallGL(show ? "Show Misspellings" : "Hide Misspellings", spell_show, nullptr, show ? menu : nullptr));
if (!menu->hasChild(word))
{
menu->addChild(new LLMenuItemCallGL(word, spell_show, nullptr, show ? &show : nullptr));
if (auto child = menu->getChild<LLView>(show ? hidestr : showstr, false, false))
menu->removeChild(child);
}
} }
mLastContextMenuX = x; mLastContextMenuX = x;