Skip to content

Commit df33d45

Browse files
author
Andrej Redeky
committed
Better "All supported" filter in open dialog
1 parent 613ff4f commit df33d45

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

src/G1AT/Utils.cpp

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <Precompiled.hpp>
88

9+
#include "Options.hpp"
910
#include "Utils.hpp"
1011

1112
std::vector<char> ReadWholeBinaryFile(const StringView8CI &acpPath)
@@ -223,19 +224,25 @@ String8CI MakeFileDialogFilter(const std::vector<std::pair<String8, String8CI>>
223224
if (filters.empty())
224225
return {};
225226

226-
String8CI allFilters;
227+
String8CI allFiltersFilter;
228+
String8CI allFiltersDisplay;
227229
for (const auto& filter : filters | std::views::values)
228230
{
229-
if (!allFilters.empty())
230-
allFilters += ";";
231+
if (!allFiltersFilter.empty())
232+
allFiltersFilter += ";";
231233

232-
allFilters += filter;
234+
allFiltersFilter += filter;
235+
236+
if (!allFiltersDisplay.empty())
237+
allFiltersDisplay += "/";
238+
239+
allFiltersDisplay += filter;
233240
}
234241

235242
String8CI result;
236243

237244
if (filters.size() > 1)
238-
result = std::format("{0} ({1})?{1}?", g_LocalizationManager.Localize("FILE_DIALOG_FILTER_ALL_SUPPORTED"), allFilters);
245+
result = std::format("{0} ({1})?{2}?", g_LocalizationManager.Localize("FILE_DIALOG_FILTER_ALL_SUPPORTED"), allFiltersDisplay, allFiltersFilter);
239246

240247
for (const auto& [identifier, filter] : filters)
241248
result += std::format("{0} ({1})?{1}?", g_LocalizationManager.Localize(identifier), filter);

0 commit comments

Comments
 (0)