miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
dP
2020-08-09 22:02:18 +03:00
parent 44a331c926 9deb84f881
commit 4c16fd967e
80 changed files with 791 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/group_gui.cpp
View File

@@ -143,29 +143,6 @@ private:
}
}
/** Sort the groups by their name */
static bool GroupNameSorter(const Group * const &a, const Group * const &b)
{
static const Group *last_group[2] = { nullptr, nullptr };
static char last_name[2][64] = { "", "" };
if (a != last_group[0]) {
last_group[0] = a;
SetDParam(0, a->index);
GetString(last_name[0], STR_GROUP_NAME, lastof(last_name[0]));
}
if (b != last_group[1]) {
last_group[1] = b;
SetDParam(0, b->index);
GetString(last_name[1], STR_GROUP_NAME, lastof(last_name[1]));
}
int r = strnatcmp(last_name[0], last_name[1]); // Sort by name (natural sorting).
if (r == 0) return a->index < b->index;
return r < 0;
}
/**
* (Re)Build the group list.
*
@@ -187,7 +164,27 @@ private:
}
list.ForceResort();
list.Sort(&GroupNameSorter);
/* Sort the groups by their name */
const Group *last_group[2] = { nullptr, nullptr };
char last_name[2][64] = { "", "" };
list.Sort([&](const Group * const &a, const Group * const &b) {
if (a != last_group[0]) {
last_group[0] = a;
SetDParam(0, a->index);
GetString(last_name[0], STR_GROUP_NAME, lastof(last_name[0]));
}
if (b != last_group[1]) {
last_group[1] = b;
SetDParam(0, b->index);
GetString(last_name[1], STR_GROUP_NAME, lastof(last_name[1]));
}
int r = strnatcmp(last_name[0], last_name[1]); // Sort by name (natural sorting).
if (r == 0) return a->index < b->index;
return r < 0;
});
AddChildren(&list, INVALID_GROUP, 0);