From 45054b224d8f0f8b6d7db4bcd0b0abf6763a60ab Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 31 Jul 2011 18:24:01 +0000 Subject: Improved map window, moved the actual map widget into a seperate class. --- src/client/gamewindow.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/client/gamewindow.cc') diff --git a/src/client/gamewindow.cc b/src/client/gamewindow.cc index d539f53..3404703 100644 --- a/src/client/gamewindow.cc +++ b/src/client/gamewindow.cc @@ -31,7 +31,7 @@ GameWindow::GameWindow(ui::Widget *parent) : ui::Window(parent) label_viewname->set_font(ui::root()->font_large()); // sub menus - gamewindow_map = new Map(this); + gamewindow_map = new MapWindow(this); gamewindow_entitymenu = new EntityMenu(this); gamewindow_buymenu = new BuyMenu(this); gamewindow_trademenu = new TradeMenu(this); @@ -304,6 +304,8 @@ void GameWindow::resize() void GameWindow::draw() { + ui::Window::draw(); + const float smallmargin = ui::UI::elementsize.height(); if (core::localcontrol()->state() == core::Entity::Docked) { @@ -364,8 +366,6 @@ void GameWindow::draw() } else { gamewindow_homebutton->disable(); - //gamewindow_notify->set_geometry(gamewindow_map->location(), gamewindow_map->size()); - if (gamewindow_entitymenu->visible()) { gamewindow_entitymenu->hide(); } -- cgit v1.2.3