upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 17:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

MP Lobby: minor cleanup of prefs hotkey callback handling

Browse Source
This commit is contained in:
Charles Dang 2016-10-08 11:31:21 +11:00
parent 4dea265113
commit 0862815e2b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/dialogs/lobby/lobby.cpp
View File

@ -142,7 +142,6 @@ tlobby_main::tlobby_main(const config& game_config, lobby_info& info, twesnothd_
, gamelist_diff_update_(true)
, wesnothd_connection_(wesnothd_connection)
, lobby_update_timer_(0)
, preferences_wrapper_()
, gamelist_id_at_row_()
, delay_playerlist_update_(false)
, delay_gamelist_update_(false)
@ -184,10 +183,10 @@ void tlobby_main::post_build(twindow& window)
window.register_hotkey(hotkey::HOTKEY_FULLSCREEN, std::bind(fullscreen, std::ref(window.video())));
/*** Local hotkeys. ***/
preferences_wrapper_ = std::bind(&tlobby_main::show_preferences_button_callback, this, std::ref(window));
window.register_hotkey(hotkey::HOTKEY_PREFERENCES,
std::bind(function_wrapper<bool, std::function<void()>>, true, std::cref(preferences_wrapper_)));
window.register_hotkey(hotkey::HOTKEY_PREFERENCES, [this](event::tdispatcher& win, hotkey::HOTKEY_COMMAND)->bool {
show_preferences_button_callback(dynamic_cast<twindow&>(win));
return true;
});
}
namespace

3
src/gui/dialogs/lobby/lobby.hpp
View File

@ -213,9 +213,6 @@ private:
/** Timer for updating the lobby. */
size_t lobby_update_timer_;
/** Wrapper for the preferences hotkey. */
std::function<void()> preferences_wrapper_;
std::vector<int> gamelist_id_at_row_;
bool delay_playerlist_update_;