mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-21 07:31:26 +02:00
Code Issues Projects Releases Wiki Activity

Remove favourite status as a sorting criterion in element searches

Browse Source 
It was added as one in c73dfe8ca0, as the highest priority criterion too. Nobody remembers why and it doesn't make much sense, so out it goes.
This commit is contained in:
Tamás Bálint Misius
2025-07-06 20:59:30 +02:00
parent 2babec6d2b
commit 154e9e8565
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/elementsearch/ElementSearchActivity.cpp
View File

@@ -14,7 +14,6 @@
#include "gui/game/Favorite.h" #include "gui/game/Favorite.h"
#include "gui/game/GameController.h" #include "gui/game/GameController.h"
#include "gui/game/ToolButton.h" #include "gui/game/ToolButton.h"
#include "gui/game/Favorite.h"
#include "graphics/Graphics.h" #include "graphics/Graphics.h"
@@ -74,23 +73,16 @@ void ElementSearchActivity::searchTools(String query)
struct Match struct Match
{ {
int favouritePriority; // relevant by whether the tool is favourited
int toolIndex; // relevance by position of tool in tools vector int toolIndex; // relevance by position of tool in tools vector
int haystackOrigin; // relevance by origin of haystack int haystackOrigin; // relevance by origin of haystack
int needlePosition; // relevance by position of needle in haystack int needlePosition; // relevance by position of needle in haystack
bool operator <(Match const &other) const bool operator <(Match const &other) const
{ {
return std::tie(favouritePriority, haystackOrigin, needlePosition, toolIndex) < std::tie(other.favouritePriority, other.haystackOrigin, other.needlePosition, other.toolIndex); return std::tie(haystackOrigin, needlePosition, toolIndex) < std::tie(other.haystackOrigin, other.needlePosition, other.toolIndex);
} }
}; };
std::set<ByteString> favs;
for (auto fav : Favorite::Ref().GetFavoritesList())
{
favs.insert(fav);
}
std::map<int, Match> indexToMatch; std::map<int, Match> indexToMatch;
auto push = [ &indexToMatch ](Match match) { auto push = [ &indexToMatch ](Match match) {
auto it = indexToMatch.find(match.toolIndex); auto it = indexToMatch.find(match.toolIndex);
@@ -104,18 +96,18 @@ void ElementSearchActivity::searchTools(String query)
} }
}; };
auto pushIfMatches = [ &queryLower, &push ](String infoLower, int toolIndex, int favouritePriority, int haystackRelevance) { auto pushIfMatches = [ &queryLower, &push ](String infoLower, int toolIndex, int haystackRelevance) {
if (infoLower == queryLower) if (infoLower == queryLower)
{ {
push(Match{ favouritePriority, toolIndex, haystackRelevance, 0 }); push(Match{ toolIndex, haystackRelevance, 0 });
} }
if (infoLower.BeginsWith(queryLower)) if (infoLower.BeginsWith(queryLower))
{ {
push(Match{ favouritePriority, toolIndex, haystackRelevance, 1 }); push(Match{ toolIndex, haystackRelevance, 1 });
} }
if (infoLower.Contains(queryLower)) if (infoLower.Contains(queryLower))
{ {
push(Match{ favouritePriority, toolIndex, haystackRelevance, 2 }); push(Match{ toolIndex, haystackRelevance, 2 });
} }
}; };
@@ -130,13 +122,12 @@ void ElementSearchActivity::searchTools(String query)
for (int toolIndex = 0; toolIndex < (int)tools.size(); ++toolIndex) for (int toolIndex = 0; toolIndex < (int)tools.size(); ++toolIndex)
{ {
int favouritePriority = favs.find(tools[toolIndex]->Identifier) != favs.end() ? 0 : 1; pushIfMatches(tools[toolIndex]->Name.ToLower(), toolIndex, 0);
pushIfMatches(tools[toolIndex]->Name.ToLower(), toolIndex, favouritePriority, 0); pushIfMatches(tools[toolIndex]->Description.ToLower(), toolIndex, 1);
pushIfMatches(tools[toolIndex]->Description.ToLower(), toolIndex, favouritePriority, 1);
auto it = menudescriptionLower.find(tools[toolIndex]); auto it = menudescriptionLower.find(tools[toolIndex]);
if (it != menudescriptionLower.end()) if (it != menudescriptionLower.end())
{ {
pushIfMatches(it->second, toolIndex, favouritePriority, 2); pushIfMatches(it->second, toolIndex, 2);
} }
} }