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

tpreferences: always apply suffix to bound status labels

Browse source
This commit is contained in:
Charles Dang 2016-02-21 20:04:30 +11:00
parent 4f6be879a5
commit 8952ca05a8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/dialogs/preferences_dialog.cpp
View file

@ -274,7 +274,7 @@ void tpreferences::bind_status_label(T& parent, const std::string& label_id,
parent.set_callback_state_change(boost::bind(
&tpreferences::status_label_callback<T>,
this, boost::ref(parent), boost::ref(label)));
this, boost::ref(parent), boost::ref(label), ""));
}
void tpreferences::bind_status_label(tslider& parent, const std::string& label_id,
@ -285,7 +285,7 @@ void tpreferences::bind_status_label(tslider& parent, const std::string& label_i
connect_signal_notify_modified(parent, boost::bind(
&tpreferences::status_label_callback<tslider>,
this, boost::ref(parent), boost::ref(label)));
this, boost::ref(parent), boost::ref(label), suffix));
}
void tpreferences::setup_friends_list(twindow& window)
@ -962,9 +962,9 @@ void tpreferences::simple_combobox_callback(const tcombobox& widget,
template <typename T>
void tpreferences::status_label_callback(T& parent_widget,
tcontrol& label_widget)
tcontrol& label_widget, const std::string& suffix)
{
label_widget.set_label(disambiguate_widget_value(parent_widget));
label_widget.set_label(disambiguate_widget_value(parent_widget) + suffix);
}
// Special fullsceen callback

2
src/gui/dialogs/preferences_dialog.hpp
View file

@ -180,7 +180,7 @@ private:
template <typename T>
void status_label_callback(T& parent_widget,
tcontrol& label_widget);
tcontrol& label_widget, const std::string& suffix = "");
typedef std::pair<ttoggle_button*, int> lobby_radio_toggle;
std::vector<lobby_radio_toggle> lobby_joins_;