mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-25 18:06:48 +00:00
Code Issues Releases Wiki Activity

Prioritize setting pages with hits in the name when searching

Browse source
This commit is contained in:
uramer 2022-02-01 22:03:01 +01:00
parent 2185fd29c5
commit f68c0c41a9
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/openmw/mwgui/settingswindow.cpp
View file

@ -756,7 +756,8 @@ namespace MWGui
return std::regex(searchRegex, flags); return std::regex(searchRegex, flags);
} }
int weightedSearch(const std::regex& regex, const std::string& text) // use double to guarantee no overflow when casting from size_t
double weightedSearch(const std::regex& regex, const std::string& text)
{ {
std::smatch matches; std::smatch matches;
std::regex_search(text, matches, regex); std::regex_search(text, matches, regex);
@ -772,24 +773,23 @@ namespace MWGui
mScriptView->setCanvasSize({0, 0}); mScriptView->setCanvasSize({0, 0});
std::regex searchRegex = wordSearch(mScriptFilter->getCaption()); std::regex searchRegex = wordSearch(mScriptFilter->getCaption());
std::vector<std::tuple<size_t, LuaUi::ScriptSettingsPage, int>> weightedPages; std::vector<std::tuple<size_t, LuaUi::ScriptSettingsPage, double, double>> weightedPages;
weightedPages.reserve(LuaUi::scriptSettingsPageCount()); weightedPages.reserve(LuaUi::scriptSettingsPageCount());
for (size_t i = 0; i < LuaUi::scriptSettingsPageCount(); ++i) for (size_t i = 0; i < LuaUi::scriptSettingsPageCount(); ++i)
{ {
LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i); LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i);
int nameSearch = 2 * weightedSearch(searchRegex, page.mName); double nameSearch = 2 * weightedSearch(searchRegex, page.mName);
int descriptionSearch = weightedSearch(searchRegex, page.mSearchHints); double hintSearch = weightedSearch(searchRegex, page.mSearchHints);
int search = nameSearch + descriptionSearch; if ((nameSearch + hintSearch) > 0)
if (search > 0) weightedPages.push_back({ i, page, -nameSearch, -hintSearch });
weightedPages.push_back({ i, page, search });
} }
std::sort(weightedPages.begin(), weightedPages.end(), [](const auto& a, const auto& b) std::sort(weightedPages.begin(), weightedPages.end(), [](const auto& a, const auto& b)
{ {
const auto& [iA, pageA, weightA] = a; const auto& [iA, pageA, nameA, hintA] = a;
const auto& [iB, pageB, weightB] = b; const auto& [iB, pageB, nameB, hintB] = b;
return weightA == weightB ? pageA.mName < pageB.mName : weightA > weightB; return std::tie(nameA, hintA, pageA.mName) < std::tie(nameB, hintB, pageB.mName);
}); });
for (const auto & [i, page, weight] : weightedPages) for (const auto & [i, page, name, hint] : weightedPages)
mScriptList->addItem(page.mName, i); mScriptList->addItem(page.mName, i);
// Hide script settings tab when the game world isn't loaded and scripts couldn't add their settings // Hide script settings tab when the game world isn't loaded and scripts couldn't add their settings
@ -814,8 +814,7 @@ namespace MWGui
mCurrentPage = *mScriptList->getItemDataAt<size_t>(index); mCurrentPage = *mScriptList->getItemDataAt<size_t>(index);
LuaUi::attachPageAt(mCurrentPage, mScriptAdapter); LuaUi::attachPageAt(mCurrentPage, mScriptAdapter);
} }
MyGUI::IntSize canvasSize = mScriptAdapter->getSize(); mScriptView->setCanvasSize(mScriptAdapter->getSize());
mScriptView->setCanvasSize(canvasSize);
} }
void SettingsWindow::onRebindAction(MyGUI::Widget* _sender) void SettingsWindow::onRebindAction(MyGUI::Widget* _sender)