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

GUI2/Menu Button: store selected index as an unsigned int

Browse source 
Also initialized it to 0 in the ctor instead of relying on that being set
via set_values().
This commit is contained in:
Charles Dang 2018-06-16 14:54:58 +11:00
parent 3526aa8e86
commit e8bd3c26d2
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gui/widgets/menu_button.cpp
View file

@ -42,7 +42,7 @@ menu_button::menu_button(const implementation::builder_menu_button& builder)
, selectable_item()
, state_(ENABLED)
, values_()
, selected_()
, selected_(0)
, keep_open_(false)
{
values_.emplace_back(::config {"label", this->get_label()});
@ -182,10 +182,10 @@ void menu_button::signal_handler_sdl_wheel_down(const event::ui_event event, boo
handled = true;
}
void menu_button::set_values(const std::vector<::config>& values, int selected)
void menu_button::set_values(const std::vector<::config>& values, unsigned selected)
{
assert(static_cast<std::size_t>(selected) < values.size());
assert(static_cast<std::size_t>(selected_) < values_.size());
assert(selected < values.size());
assert(selected_ < values_.size());
values_ = values;
selected_ = selected;
@ -193,10 +193,10 @@ void menu_button::set_values(const std::vector<::config>& values, int selected)
set_label(values_[selected_]["label"]);
}
void menu_button::set_selected(int selected, bool fire_event)
void menu_button::set_selected(unsigned selected, bool fire_event)
{
assert(static_cast<std::size_t>(selected) < values_.size());
assert(static_cast<std::size_t>(selected_) < values_.size());
assert(selected < values_.size());
assert(selected_ < values_.size());
selected_ = selected;

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

@ -56,9 +56,9 @@ public:
/***** ***** ***** setters / getters for members ***** ****** *****/
void set_values(const std::vector<::config>& values, int selected = 0);
void set_values(const std::vector<::config>& values, unsigned selected = 0);
void set_selected(int selected, bool fire_event = true);
void set_selected(unsigned selected, bool fire_event = true);
/** Inherited from selectable_item */
virtual unsigned get_value() const override { return selected_; }
@ -111,7 +111,7 @@ private:
std::vector<::config> values_;
int selected_;
unsigned selected_;
bool keep_open_;