Added provisionary close button to map, inventory and trade window,

always show the trade window buy button, disable it if approriate.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/client/inventorywindow.cc b/src/client/inventorywindow.cc
index cca8cc2..f22a36d 100644
--- a/src/client/inventorywindow.cc
+++ b/src/client/inventorywindow.cc
@@ -30,6 +30,9 @@ InventoryWindow::InventoryWindow(ui::Widget *parent) : ui::Window(parent)
 	inventorywindow_titlelabel->set_alignment(ui::AlignCenter);
 	inventorywindow_titlelabel->set_text("INVENTORY");
 	
+	// close button
+	inventorywindow_closebutton = new ui::IconButton(inventorywindow_titlelabel, "bitmaps/icons/window_close");
+	
 	inventorywindow_modelview = new ui::ModelView(this);
 	inventorywindow_modelview->set_label("modelview");
 	inventorywindow_modelview->set_background(false);
@@ -183,6 +186,10 @@ void InventoryWindow::resize()
 	inventorywindow_titlelabel->set_size(width() - padding * 2.0f, inventorywindow_titlelabel->font()->height());	
 	inventorywindow_titlelabel->set_location(padding, padding);
 	
+	// resize close button
+	inventorywindow_closebutton->set_size(inventorywindow_titlelabel->font()->height(), inventorywindow_titlelabel->font()->height());
+	inventorywindow_closebutton->set_location(inventorywindow_titlelabel->width() - inventorywindow_closebutton->width(), 0);
+	
 	// resize inventory listview
 	inventorywindow_listview->set_size(ui::UI::elementsize.width(), height() -icon_size - padding * 8.0f);
 	inventorywindow_listview->set_location(padding, padding * 6.0f);
@@ -275,11 +282,14 @@ bool InventoryWindow::on_emit(Widget *sender, const Event event, void *data)
 {
 	if (event == ui::Widget::EventButtonClicked) {
 	
-		if (sender == inventorywindow_shipbutton) {			
+		if (sender == inventorywindow_shipbutton) {
 			inventorywindow_listview->deselect();
 			set_info(core::localcontrol() ? core::localcontrol()->info() : 0, 0);
 			inventorywindow_modeltitlelabel->set_text("Ship Info");
+		} else if (sender == inventorywindow_closebutton) {
+			hide();
 		}
+		
 		return true;
 	
 	} else if (event == ui::Widget::EventListViewChanged) {
@@ -289,7 +299,7 @@ bool InventoryWindow::on_emit(Widget *sender, const Event event, void *data)
 			set_info(inventorywindow_listview->selected() ? inventorywindow_listview->selected()->info() : 0, inventorywindow_listview->selected()->item()->amount());
 		}
 		return true;
-	}
+	} 
 	
 	return Window::on_emit(sender, event, data);
 }