Skip to content

Commit

Permalink
GUI2: removed state_changed callback interface from selected_item chi…
Browse files Browse the repository at this point in the history
…ld classes

I left the callbacks in tree_view_node for now since they don't really inherit from selected_item and
I need to make it fire NOTIFY_MODIFED correctly and decide if I want to keep the state to-fold/to-unfold
distinctions.
  • Loading branch information
Vultraz committed Aug 25, 2017
1 parent 729e66e commit 7f265e4
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 50 deletions.
4 changes: 0 additions & 4 deletions src/gui/widgets/menu_button.cpp
Expand Up @@ -154,10 +154,6 @@ void menu_button::signal_handler_left_button_click(const event::ui_event event,

fire(event::NOTIFY_MODIFIED, *this, nullptr);

if(callback_state_change_) {
callback_state_change_(*this);
}

if(retval_ != 0) {
if(window* window = get_window()) {
window->set_retval(retval_);
Expand Down
9 changes: 0 additions & 9 deletions src/gui/widgets/menu_button.hpp
Expand Up @@ -86,12 +86,6 @@ class menu_button : public styled_widget, public selectable_item
/** Inherited from selectable_item */
virtual unsigned num_states() const override { return values_.size(); }

/** Inherited from selectable_item */
virtual void set_callback_state_change(std::function<void(widget&)> callback) override
{
callback_state_change_ = callback;
}

/** Returns the value of the selected row */
std::string get_value_string() const
{
Expand Down Expand Up @@ -142,9 +136,6 @@ class menu_button : public styled_widget, public selectable_item

dialogs::drop_down_menu* droplist_;

/** See selectable_item::set_callback_state_change. */
std::function<void(widget&)> callback_state_change_;

/** Inherited from styled_widget, implemented by REGISTER_WIDGET. */
virtual const std::string& get_control_type() const override;

Expand Down
6 changes: 0 additions & 6 deletions src/gui/widgets/selectable_item.hpp
Expand Up @@ -55,12 +55,6 @@ class selectable_item
assert(num_states() == 2);
return set_value(value);
}
/**
* When the user does something to change the widget state this event is
* fired. Most of the time it will be a left click on the widget.
*/
virtual void
set_callback_state_change(std::function<void(widget&)> callback) = 0;
};

} // namespace gui2
5 changes: 0 additions & 5 deletions src/gui/widgets/toggle_button.cpp
Expand Up @@ -41,7 +41,6 @@ toggle_button::toggle_button(const implementation::builder_toggle_button& builde
, state_(ENABLED)
, state_num_(0)
, retval_(0)
, callback_state_change_()
, icon_name_()
{
connect_signal<event::MOUSE_ENTER>(std::bind(
Expand Down Expand Up @@ -126,10 +125,6 @@ void toggle_button::set_value(const unsigned selected)
}

fire(event::NOTIFY_MODIFIED, *this, nullptr);

if(callback_state_change_) {
callback_state_change_(*this);
}
}

void toggle_button::set_retval(const int retval)
Expand Down
9 changes: 0 additions & 9 deletions src/gui/widgets/toggle_button.hpp
Expand Up @@ -68,12 +68,6 @@ class toggle_button : public styled_widget, public selectable_item

void set_retval(const int retval);

/** Inherited from selectable_item. */
void set_callback_state_change(std::function<void(widget&)> callback) override
{
callback_state_change_ = callback;
}

void set_icon_name(const std::string& icon_name)
{
icon_name_ = icon_name;
Expand Down Expand Up @@ -122,9 +116,6 @@ class toggle_button : public styled_widget, public selectable_item
*/
int retval_;

/** See selectable_item::set_callback_state_change. */
std::function<void(widget&)> callback_state_change_;

/**
* The toggle button can contain an icon next to the text.
* Maybe this will move the the styled_widget class if deemed needed.
Expand Down
8 changes: 0 additions & 8 deletions src/gui/widgets/toggle_panel.cpp
Expand Up @@ -42,7 +42,6 @@ toggle_panel::toggle_panel(const implementation::builder_toggle_panel& builder)
, state_(ENABLED)
, state_num_(0)
, retval_(0)
, callback_state_change_(nullptr)
, callback_mouse_left_double_click_()
{
set_wants_mouse_left_double_click();
Expand Down Expand Up @@ -248,10 +247,6 @@ toggle_panel::signal_handler_pre_left_button_click(const event::ui_event event)
*/

fire(event::NOTIFY_MODIFIED, *this, nullptr);

if(callback_state_change_) {
callback_state_change_(*this);
}
#endif
}

Expand All @@ -266,9 +261,6 @@ void toggle_panel::signal_handler_left_button_click(const event::ui_event event,

fire(event::NOTIFY_MODIFIED, *this, nullptr);

if(callback_state_change_) {
callback_state_change_(*this);
}
handled = true;
}

Expand Down
9 changes: 0 additions & 9 deletions src/gui/widgets/toggle_panel.hpp
Expand Up @@ -105,12 +105,6 @@ class toggle_panel : public panel, public selectable_item

void set_retval(const int retval);

/** Inherited from selectable_item. */
void set_callback_state_change(std::function<void(widget&)> callback) override
{
callback_state_change_ = callback;
}

void set_callback_mouse_left_double_click(
std::function<void(widget&)> callback)
{
Expand Down Expand Up @@ -156,9 +150,6 @@ class toggle_panel : public panel, public selectable_item
*/
int retval_;

/** See selectable_item::set_callback_state_change. */
std::function<void(widget&)> callback_state_change_;

/** Mouse left double click callback */
std::function<void(widget&)> callback_mouse_left_double_click_;

Expand Down

0 comments on commit 7f265e4

Please sign in to comment.