diff options
| -rw-r--r-- | src/widgets/dropdown.cpp | 15 | ||||
| -rw-r--r-- | src/widgets/dropdown_type.h | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index 1d5878aa5..1b5ba6a01 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -38,6 +38,21 @@ void DropDownListStringItem::Draw(int left, int right, int top, int bottom, bool DrawString(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, top, this->String(), sel ? TC_WHITE : TC_BLACK); } +/** + * Natural sorting comparator function for DropDownList::sort(). + * @param first Left side of comparison. + * @param second Right side of comparison. + * @return true if \a first precedes \a second. + * @warning All items in the list need to be derivates of DropDownListStringItem. + */ +/* static */ bool DropDownListStringItem::NatSortFunc(const DropDownListItem *first, const DropDownListItem *second) +{ + char buffer1[512], buffer2[512]; + GetString(buffer1, static_cast<const DropDownListStringItem*>(first)->String(), lastof(buffer1)); + GetString(buffer2, static_cast<const DropDownListStringItem*>(second)->String(), lastof(buffer2)); + return strnatcmp(buffer1, buffer2) < 0; +} + StringID DropDownListParamStringItem::String() const { for (uint i = 0; i < lengthof(this->decode_params); i++) SetDParam(i, this->decode_params[i]); diff --git a/src/widgets/dropdown_type.h b/src/widgets/dropdown_type.h index 4981cbee7..6edc5b847 100644 --- a/src/widgets/dropdown_type.h +++ b/src/widgets/dropdown_type.h @@ -49,6 +49,8 @@ public: virtual uint Width() const; virtual void Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const; virtual StringID String() const { return this->string; } + + static bool NatSortFunc(const DropDownListItem *first, const DropDownListItem *second); }; /** |