0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI2/Listbox: adjustments for 7d92a8cb4a

Browse source
This commit is contained in:
Charles Dang 2024-12-09 01:55:13 -05:00
parent 7d92a8cb4a
commit f7a271dab9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/widgets/listbox.cpp
View file

@ -553,7 +553,7 @@ void listbox::handle_key_right_arrow(SDL_Keymod modifier, bool& handled)
}
}
void listbox::initialize_sorter(const std::string& id, generator_sort_array&& array)
void listbox::initialize_sorter(std::string_view id, generator_sort_array&& array)
{
auto header = find_widget<grid>("_header_grid", false, false);
if(!header) return;
@ -612,7 +612,7 @@ bool listbox::sort_helper::more(const t_string& lhs, const t_string& rhs)
return translation::icompare(lhs, rhs) > 0;
}
void listbox::set_active_sorter(const std::string& id, sort_order::type order, bool select_first)
void listbox::set_active_sorter(std::string_view id, sort_order::type order, bool select_first)
{
for(auto& [w, _] : orders_) {
if(!w || dynamic_cast<widget*>(w)->id() != id) continue;

6
src/gui/widgets/listbox.hpp
View file

@ -263,7 +263,7 @@ private:
};
/** Implementation detail of @ref set_single_sorter */
void initialize_sorter(const std::string& id, generator_sort_array&&);
void initialize_sorter(std::string_view id, generator_sort_array&&);
/** Implementation detail of @ref set_sorters */
template<std::size_t... Is, typename... Args>
@ -280,7 +280,7 @@ public:
* @param f Any callable whose result is sortable.
*/
template<typename Func>
void set_single_sorter(const std::string& id, const Func& f)
void set_single_sorter(std::string_view id, const Func& f)
{
initialize_sorter(id, {
[f](int lhs, int rhs) { return sort_helper::less(f(lhs), f(rhs)); },
@ -314,7 +314,7 @@ public:
* If false (default), the selected row will be maintained
* post-sort as per standard sorting functionality.
*/
void set_active_sorter(const std::string& id, sort_order::type order, bool select_first = false);
void set_active_sorter(std::string_view id, sort_order::type order, bool select_first = false);
/** Returns a widget pointer to the active sorter, along with its corresponding order. */
std::pair<widget*, sort_order::type> get_active_sorter() const;