Merge remote-tracking branch 'upstream/master'

Base class for text entry
This commit is contained in:
furrtek 2017-06-21 03:25:27 +01:00
commit abd154b3c7
131 changed files with 19385 additions and 5412 deletions

View file

@ -51,7 +51,7 @@ public:
MenuItemView(
MenuItem item,
bool keep_highlight
) : item(item),
) : item { item },
keep_highlight_ { keep_highlight }
{
}
@ -75,15 +75,9 @@ public:
~MenuView();
void add_item(const MenuItem item);
void add_item(MenuItem item);
void add_items(std::initializer_list<MenuItem> items);
void clear();
template<size_t N>
void add_items(const std::array<MenuItem, N>& items) {
for (const auto& item : items) {
add_item(item);
}
}
MenuItemView* item_view(size_t index) const;