diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-01-27 18:53:24 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-01-27 18:53:24 +0000 |
| commit | 9c2d1a1c867bbd7eea083dbc03c0acf1edace8c2 (patch) | |
| tree | 51b0f6e52d4dc368fc8358aa86cca395b6d2506b /src/client/map.cc | |
| parent | 76a49efdf62a53a54e2deeb559422f11c1e955dd (diff) | |
moves docking menus from ui to client,
allow map and chat window while docked
Diffstat (limited to 'src/client/map.cc')
| -rw-r--r-- | src/client/map.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/client/map.cc b/src/client/map.cc index 7d1536d..35fb6d1 100644 --- a/src/client/map.cc +++ b/src/client/map.cc @@ -15,7 +15,7 @@ namespace client { -Map::Map(ui::Widget *parent) : ui::Widget(parent) +Map::Map(ui::Widget *parent) : ui::Window(parent) { set_label("map"); set_border(true); @@ -29,7 +29,7 @@ Map::~Map() void Map::hide() { - ui::Widget::hide(); + ui::Window::hide(); map_hover = 0; } @@ -182,6 +182,11 @@ bool Map::on_keypress(const int key, const unsigned int modifier) if ((hover()) && (key == 512 + SDL_BUTTON_LEFT)) { targets::select_target(hover()); return true; + } else if (key == SDLK_ESCAPE) { + if (visible()) { + hide(); + return true; + } } return false; |