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

Menu Button: minor code formatting cleanup

Browse source
This commit is contained in:
Charles Dang 2017-02-17 14:39:31 +11:00
parent d0d5204130
commit 8e1ca91e41
2 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,8 +95,7 @@ const std::string& menu_button::get_control_type() const
return type;
}
void menu_button::signal_handler_mouse_enter(const event::ui_event event,
bool& handled)
void menu_button::signal_handler_mouse_enter(const event::ui_event event, bool& handled)
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
@ -104,8 +103,7 @@ void menu_button::signal_handler_mouse_enter(const event::ui_event event,
handled = true;
}
void menu_button::signal_handler_mouse_leave(const event::ui_event event,
bool& handled)
void menu_button::signal_handler_mouse_leave(const event::ui_event event, bool& handled)
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
@ -113,8 +111,7 @@ void menu_button::signal_handler_mouse_leave(const event::ui_event event,
handled = true;
}
void menu_button::signal_handler_left_button_down(const event::ui_event event,
bool& handled)
void menu_button::signal_handler_left_button_down(const event::ui_event event, bool& handled)
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
@ -127,8 +124,7 @@ void menu_button::signal_handler_left_button_down(const event::ui_event event,
handled = true;
}
void menu_button::signal_handler_left_button_up(const event::ui_event event,
bool& handled)
void menu_button::signal_handler_left_button_up(const event::ui_event event, bool& handled)
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
@ -136,8 +132,7 @@ void menu_button::signal_handler_left_button_up(const event::ui_event event,
handled = true;
}
void menu_button::signal_handler_left_button_click(const event::ui_event event,
bool& handled)
void menu_button::signal_handler_left_button_click(const event::ui_event event, bool& handled)
{
assert(get_window());
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
@ -200,22 +195,29 @@ void menu_button::set_values(const std::vector<::config>& values, int selected)
{
assert(static_cast<size_t>(selected) < values.size());
assert(static_cast<size_t>(selected_) < values_.size());
if(values[selected]["label"] != values_[selected_]["label"]) {
set_is_dirty(true);
}
values_ = values;
selected_ = selected;
toggle_states_.resize(values_.size(), false);
set_label(values_[selected_]["label"]);
}
void menu_button::set_selected(int selected)
{
assert(static_cast<size_t>(selected) < values_.size());
assert(static_cast<size_t>(selected_) < values_.size());
if(selected != selected_) {
set_is_dirty(true);
}
selected_ = selected;
set_label(values_[selected_]["label"]);
}
@ -330,8 +332,9 @@ widget* builder_menu_button::build() const
if(!options_.empty()) {
widget->set_values(options_);
}
DBG_GUI_G << "Window builder: placed menu_button '" << id
<< "' with definition '" << definition << "'.\n";
<< "' with definition '" << definition << "'.\n";
return widget;
}

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

@ -66,11 +66,10 @@ public:
{
retval_ = retval;
}
void set_values(const std::vector<::config>& values, int selected = 0);
void set_selected(int selected);
/** See selectable_item::set_callback_state_change. */
std::function<void(widget&)> callback_state_change_;
void set_values(const std::vector<::config>& values, int selected = 0);
void set_selected(int selected);
/** Inherited from selectable_item */
virtual unsigned get_value() const override { return selected_; }
@ -88,9 +87,15 @@ public:
}
/** Returns the value of the selected row */
std::string get_value_string() const { return values_[selected_]["label"]; }
std::string get_value_string() const
{
return values_[selected_]["label"];
}
boost::dynamic_bitset<> get_toggle_states() const { return toggle_states_; }
boost::dynamic_bitset<> get_toggle_states() const
{
return toggle_states_;
}
void set_keep_open(const bool keep_open)
{
@ -112,6 +117,7 @@ private:
};
void set_state(const state_t state);
/**
* Current state of the widget.
*
@ -127,17 +133,18 @@ private:
* the window and the window closes itself.
*/
int retval_;
/**
*/
std::vector<::config> values_;
/**
*/
int selected_;
boost::dynamic_bitset<> toggle_states_;
bool keep_open_;
/** See selectable_item::set_callback_state_change. */
std::function<void(widget&)> callback_state_change_;
/** See @ref styled_widget::get_control_type. */
virtual const std::string& get_control_type() const override;
@ -147,14 +154,11 @@ private:
void signal_handler_mouse_leave(const event::ui_event event, bool& handled);
void signal_handler_left_button_down(const event::ui_event event,
bool& handled);
void signal_handler_left_button_down(const event::ui_event event, bool& handled);
void signal_handler_left_button_up(const event::ui_event event,
bool& handled);
void signal_handler_left_button_up(const event::ui_event event, bool& handled);
void signal_handler_left_button_click(const event::ui_event event,
bool& handled);
void signal_handler_left_button_click(const event::ui_event event, bool& handled);
};
// }---------- DEFINITION ---------{