From 5afce7d29a2d852446b58b4410c43d7bf2063b11 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 28 Aug 2011 18:19:48 +0000
Subject: Added client::ButtonMenu base class, refactored client::EntityMenu as
 a ButtonMenu child.

---
 src/client/gamewindow.cc | 43 ++++++++++++-------------------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

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

diff --git a/src/client/gamewindow.cc b/src/client/gamewindow.cc
index 3404703..a2693e1 100644
--- a/src/client/gamewindow.cc
+++ b/src/client/gamewindow.cc
@@ -24,15 +24,15 @@ GameWindow::GameWindow(ui::Widget *parent) : ui::Window(parent)
 
 	gamewindow_hud = new HUD(this);
 
-	label_viewname = new ui::Label(this);
-	label_viewname->set_label("viewnamelabel");
-	label_viewname->set_alignment(ui::AlignCenter);
-	label_viewname->set_background(true);
-	label_viewname->set_font(ui::root()->font_large());
+	//label_viewname = new ui::Label(this);
+	//label_viewname->set_label("viewnamelabel");
+	//label_viewname->set_alignment(ui::AlignCenter);
+	//label_viewname->set_background(true);
+	//label_viewname->set_font(ui::root()->font_large());
 
 	// sub menus	
 	gamewindow_map = new MapWindow(this);
-	gamewindow_entitymenu = new EntityMenu(this);
+	gamewindow_entitymenu = new EntityMenu(this, "entitymenu");
 	gamewindow_buymenu = new BuyMenu(this);
 	gamewindow_trademenu = new TradeMenu(this);
 	gamewindow_inventory = new InventoryWindow(this);
@@ -282,6 +282,7 @@ void GameWindow::resize()
 	
 	// reposition buy menu
 	gamewindow_buymenu->event_resize();
+	
 	// reposition trade menu
 	gamewindow_trademenu->event_resize();
 
@@ -289,6 +290,10 @@ void GameWindow::resize()
 	gamewindow_hud->set_geometry(0, 0, width(), height());
 	gamewindow_hud->event_resize();
 
+	// reposition entity menus
+	gamewindow_entitymenu->set_size(width() -  smallmargin * 2, height() -  smallmargin * 4);
+	gamewindow_entitymenu->set_location(smallmargin, smallmargin * 2);
+	
 	// reposition map
 	gamewindow_map->set_size(width() -  smallmargin * 2, height() -  smallmargin * 4);
 	gamewindow_map->set_location(smallmargin, smallmargin * 2);
@@ -296,10 +301,6 @@ void GameWindow::resize()
 	// reposition inventory
 	gamewindow_inventory->set_size(width() -  smallmargin * 2, height() -  smallmargin * 4);
 	gamewindow_inventory->set_location(smallmargin, smallmargin * 2);
-	
-	// reposition labels
-	label_viewname->set_size(ui::UI::elementsize.width() * 1.5f, ui::UI::elementsize.height());
-	label_viewname->set_location(width() - label_viewname->width() - smallmargin, height() - label_viewname->height() - smallmargin * 0.5f);
 }
 
 void GameWindow::draw()
@@ -324,16 +325,6 @@ void GameWindow::draw()
 		// docking view
 		if (core::localplayer()->view()->menus().size()) {
 
-			// entity with menus
-
-			if (map()->visible()) {
-				label_viewname->set_text(core::localplayer()->zone()->name());
-			} else {
-				label_viewname->set_text(core::localplayer()->view()->name());
-			}
-
-			label_viewname->show();
-
 			if (gamewindow_entitymenu->generated_entity() != core::localplayer()->view()) {
 				// initially show the menu
 				show_menu("main");
@@ -351,10 +342,7 @@ void GameWindow::draw()
 				// show the menu if there's no other window open
 				gamewindow_entitymenu->show();
 			}
-
-			//gamewindow_notify->set_size(width() - smallmargin * 3.0f - ui::UI::elementsize.width() * 1.5f, height() -  smallmargin * 4.0f);
-			//gamewindow_notify->set_location(smallmargin * 2.0f + ui::UI::elementsize.width() * 1.5f, smallmargin * 2.0f);
-			
+		
 			gamewindow_homebutton->enable();
 
 		} else {
@@ -381,13 +369,6 @@ void GameWindow::draw()
 		if (gamewindow_trademenu->visible()) {
 			gamewindow_trademenu->hide();
 		}
-		
-		if (map()->visible()) {
-			label_viewname->set_text(core::localplayer()->zone()->name());
-			label_viewname->show();
-		} else {
-			label_viewname->hide();
-		}
 
 		if (!map()->visible() && !chat()->visible() && !inventory()->visible()) {
 			gamewindow_hud->set_focus();
-- 
cgit v1.2.3