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

MP Lobby: Re-enable Esc key to exit, now with confirmation

Browse source
This commit is contained in:
Celtic Minstrel 2016-09-05 01:50:58 -04:00
parent d46a327029
commit a4655b5ede
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gui/dialogs/lobby/lobby.cpp
View file

@ -305,10 +305,16 @@ void tlobby_main::do_notify(t_notify_mode mode, const std::string & sender, cons
}
}
bool tlobby_main::logout_prompt()
{
return show_prompt(_("Do you really want to log out?"));
}
tlobby_main::tlobby_main(const config& game_config,
lobby_info& info,
twesnothd_connection &wesnothd_connection)
: legacy_result_(QUIT)
: quit_confirmation(&tlobby_main::logout_prompt)
, legacy_result_(QUIT)
, game_config_(game_config)
, gamelistbox_(nullptr)
, roomlistbox_(nullptr)
@ -859,6 +865,18 @@ void tlobby_main::update_selected_game()
player_list_dirty_ = true;
}
void tlobby_main::signal_handler_key_down(SDLKey key, bool& handled, bool& halt)
{
if(key == SDLK_ESCAPE) {
if(quit()) {
window_->set_retval(twindow::OK);
window_->close();
}
handled = true;
halt = true;
}
}
void tlobby_main::pre_show(twindow& window)
{
SCOPE_LB;
@ -904,6 +922,10 @@ void tlobby_main::pre_show(twindow& window)
window.set_enter_disabled(true);
window.set_escape_disabled(true);
// A new key handler to deal with escape in a different manner.
window.connect_signal<event::SDL_KEY_DOWN>(
std::bind(&tlobby_main::signal_handler_key_down, this, _5, _3, _4),
event::tdispatcher::front_pre_child);
window_ = &window;

7
src/gui/dialogs/lobby/lobby.hpp
View file

@ -21,6 +21,7 @@
#include "gui/dialogs/lobby/info.hpp"
#include "gui/dialogs/multiplayer/plugin_executor.hpp"
#include "game_initialization/multiplayer.hpp"
#include "quit_confirmation.hpp"
class display;
@ -76,7 +77,7 @@ struct tplayer_list
ttree_view* tree;
};
class tlobby_main : public tdialog, private events::chat_handler, private plugin_executor
class tlobby_main : public tdialog, public quit_confirmation, private events::chat_handler, private plugin_executor
{
public:
tlobby_main(const config& game_config, lobby_info& info, twesnothd_connection &wesnothd_connection);
@ -346,6 +347,10 @@ private:
void skip_replay_changed_callback(twindow& window);
void signal_handler_key_down(SDLKey key, bool& handled, bool& halt);
static bool logout_prompt();
/** Inherited from tdialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;