github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 04:50:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Search Crash from Scrolling (#5571)

Browse source 
* Fix search crashing when section child scrolled too far.

* clang
This commit is contained in:
Malkierian 2025-06-11 14:35:57 -07:00 • committed by GitHub
commit 0b9fe2d9b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

54
soh/soh/SohGui/Menu.cpp
View file

@ -185,33 +185,35 @@ bool ModernMenuHeaderEntry(std::string label) {
} }
uint32_t Menu::DrawSearchResults(std::string& menuSearchText) { uint32_t Menu::DrawSearchResults(std::string& menuSearchText) {
ImGui::BeginChild("Search Results");
int searchCount = 0; int searchCount = 0;
for (auto& menuLabel : menuOrder) { if (ImGui::BeginChild("Search Results")) {
auto& menuEntry = menuEntries.at(menuLabel); for (auto& menuLabel : menuOrder) {
for (auto& sidebarLabel : menuEntry.sidebarOrder) { auto& menuEntry = menuEntries.at(menuLabel);
auto& sidebar = menuEntry.sidebars[sidebarLabel]; for (auto& sidebarLabel : menuEntry.sidebarOrder) {
for (int i = 0; i < sidebar.columnWidgets.size(); i++) { auto& sidebar = menuEntry.sidebars[sidebarLabel];
auto& column = sidebar.columnWidgets.at(i); for (int i = 0; i < sidebar.columnWidgets.size(); i++) {
for (auto& info : column) { auto& column = sidebar.columnWidgets.at(i);
if (info.type == WIDGET_SEARCH || info.type == WIDGET_SEPARATOR || for (auto& info : column) {
info.type == WIDGET_SEPARATOR_TEXT || info.isHidden) { if (info.type == WIDGET_SEARCH || info.type == WIDGET_SEPARATOR ||
continue; info.type == WIDGET_SEPARATOR_TEXT || info.isHidden) {
} continue;
const char* tooltip = info.options->tooltip; }
std::string widgetStr = std::string(info.name) + std::string(tooltip != NULL ? tooltip : ""); const char* tooltip = info.options->tooltip;
std::transform(menuSearchText.begin(), menuSearchText.end(), menuSearchText.begin(), ::tolower); std::string widgetStr = std::string(info.name) + std::string(tooltip != NULL ? tooltip : "");
menuSearchText.erase(std::remove(menuSearchText.begin(), menuSearchText.end(), ' '), std::transform(menuSearchText.begin(), menuSearchText.end(), menuSearchText.begin(), ::tolower);
menuSearchText.end()); menuSearchText.erase(std::remove(menuSearchText.begin(), menuSearchText.end(), ' '),
std::transform(widgetStr.begin(), widgetStr.end(), widgetStr.begin(), ::tolower); menuSearchText.end());
widgetStr.erase(std::remove(widgetStr.begin(), widgetStr.end(), ' '), widgetStr.end()); std::transform(widgetStr.begin(), widgetStr.end(), widgetStr.begin(), ::tolower);
if (widgetStr.find(menuSearchText) != std::string::npos) { widgetStr.erase(std::remove(widgetStr.begin(), widgetStr.end(), ' '), widgetStr.end());
MenuDrawItem(info, 90 / sidebar.columnCount, menuThemeIndex); if (widgetStr.find(menuSearchText) != std::string::npos) {
ImGui::PushStyleColor(ImGuiCol_Text, UIWidgets::ColorValues.at(UIWidgets::Colors::Gray)); MenuDrawItem(info, 90 / sidebar.columnCount, menuThemeIndex);
std::string origin = fmt::format(" ({} -> {}, Col {})", menuEntry.label, sidebarLabel, i + 1); ImGui::PushStyleColor(ImGuiCol_Text, UIWidgets::ColorValues.at(UIWidgets::Colors::Gray));
ImGui::Text("%s", origin.c_str()); std::string origin =
ImGui::PopStyleColor(); fmt::format(" ({} -> {}, Col {})", menuEntry.label, sidebarLabel, i + 1);
searchCount++; ImGui::Text("%s", origin.c_str());
ImGui::PopStyleColor();
searchCount++;
}
} }
} }
} }