From 9c2d1a1c867bbd7eea083dbc03c0acf1edace8c2 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 27 Jan 2009 18:53:24 +0000
Subject: moves docking menus from ui to client, allow map and chat window
 while docked

---
 src/client/map.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/client/map.cc')

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;
-- 
cgit v1.2.3