mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: Simplify GetScrolledItemFromWidget() (#12556) 

Return `auto`, which allows working with const containers, and use std::next instead of std::advance.
This commit is contained in:
Peter Nelson 2024-04-22 20:00:14 +01:00 committed by GitHub
parent c82a2575d7
commit 3814adaba8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widget_type.h
View File

@ -875,15 +875,13 @@ public:
* @return Iterator to the element clicked at. If clicked at a wrong position, returns as interator to the end of the container.
*/
template <typename Tcontainer>
typename Tcontainer::iterator GetScrolledItemFromWidget(Tcontainer &container, int clickpos, const Window * const w, WidgetID widget, int padding = 0, int line_height = -1) const
auto GetScrolledItemFromWidget(Tcontainer &container, int clickpos, const Window * const w, WidgetID widget, int padding = 0, int line_height = -1) const
{
assert(static_cast<size_t>(this->GetCount()) == container.size()); // Scrollbar and container size must match.
size_type row = this->GetScrolledRowFromWidget(clickpos, w, widget, padding, line_height);
if (row == Scrollbar::npos) return std::end(container);
typename Tcontainer::iterator it = std::begin(container);
std::advance(it, row);
return it;
return std::next(std::begin(container), row);
}
EventState UpdateListPositionOnKeyPress(int &list_position, uint16_t keycode) const;