More inventory and trade menu fancyfication.

1 files changed, 28 insertions, 27 deletions

diff --git a/src/client/inventorywindow.cc b/src/client/inventorywindow.cc
index 459d7c5..de27d13 100644
--- a/src/client/inventorywindow.cc
+++ b/src/client/inventorywindow.cc
@@ -56,11 +56,12 @@ InventoryWindow::InventoryWindow(ui::Widget *parent) : ui::Window(parent)
 	//inventorywindow_listview->set_background(true);
 	//inventorywindow_listview->set_border(true);
 	
-	inventorywindow_inventorytext = new ui::PlainText(this);
+	inventorywindow_inventorytext = new ui::Label(this);
 	inventorywindow_inventorytext->set_label("inventorytext");
 	inventorywindow_inventorytext->set_background(true);
 	inventorywindow_inventorytext->set_border(true);
 	inventorywindow_inventorytext->set_font(ui::root()->font_small());
+	inventorywindow_inventorytext->set_alignment(ui::AlignLeft | ui::AlignTop);
 	
 	inventorywindow_shipbutton = new ui::IconButton(this, "bitmaps/icons/button_ship");	
 	inventorywindow_ejectbutton = new ui::IconButton(this, "bitmaps/icons/button_eject");
@@ -82,9 +83,7 @@ InventoryWindow::InventoryWindow(ui::Widget *parent) : ui::Window(parent)
 	inventorywindow_ejectconfirmbutton = new ui::Button(inventorywindow_scrollpane, "Eject");
 	inventorywindow_ejectcancelbutton = new ui::Button(inventorywindow_scrollpane, "Cancel");
 	inventorywindow_ejectslider = new ui::Slider(inventorywindow_scrollpane);
-	
-	
-	
+
 	hide();
 }
 
@@ -226,7 +225,7 @@ void InventoryWindow::resize()
 	inventorywindow_closebutton->set_location(inventorywindow_titlelabel->width() - inventorywindow_closebutton->width(), 0);
 	
 	// resize inventory text
-	inventorywindow_inventorytext->set_size(ui::UI::elementsize.width(), padding * 2.0f);
+	inventorywindow_inventorytext->set_size(ui::UI::elementsize.width(), inventorywindow_inventorytext->font()->height() * 3.0f);
 	inventorywindow_inventorytext->set_location(inventorywindow_titlelabel->left(), inventorywindow_titlelabel->bottom() + padding);
 	
 	// resize inventory listview
@@ -263,27 +262,28 @@ void InventoryWindow::resize()
 		// resize target info text
 		inventorywindow_scrollpane->set_size(inventorywindow_modeltitlelabel->width(), pane->height() - inventorywindow_modeltitlelabel->bottom() - margin_vertical * 2.0f);
 		inventorywindow_scrollpane->set_location(inventorywindow_modelview->left(), inventorywindow_modeltitlelabel->bottom() + margin_vertical);
-	}
 	
-	// eject dialog buttons
-	inventorywindow_ejectslider->set_size(
-		inventorywindow_scrollpane->width() - ui::UI::elementsize.width(),
-		inventorywindow_ejectslider->font()->height()
-	);
-	inventorywindow_ejectslider->set_location(
-		(inventorywindow_scrollpane->width() - inventorywindow_ejectslider->width()) * 0.5f,
-		0.0f
-	);	
-	inventorywindow_ejectconfirmbutton->set_size(ui::UI::elementsize);
-	inventorywindow_ejectconfirmbutton->set_location(		
-		(inventorywindow_scrollpane->width() - ui::UI::elementsize.width() * 2.0f - padding) * 0.5f,
-		inventorywindow_ejectslider->bottom() + padding
-	);
-	inventorywindow_ejectcancelbutton->set_size(ui::UI::elementsize);
-	inventorywindow_ejectcancelbutton->set_location(		
-		inventorywindow_ejectconfirmbutton->right() + padding,
-		inventorywindow_ejectslider->bottom() + padding
-	);
+		// eject dialog buttons
+		inventorywindow_ejectslider->set_size(
+			math::min(inventorywindow_scrollpane->width() - padding * 2.0f, ui::UI::elementsize.width() * 2.5f),
+			inventorywindow_ejectslider->font()->height()
+		);
+		inventorywindow_ejectslider->set_location(
+			(inventorywindow_scrollpane->width() - inventorywindow_ejectslider->width()) * 0.5f,
+			padding - margin_vertical
+		);
+		inventorywindow_ejectconfirmbutton->set_size(ui::UI::elementsize);
+		inventorywindow_ejectconfirmbutton->set_location(		
+			(inventorywindow_scrollpane->width() - ui::UI::elementsize.width() * 2.0f - padding) * 0.5f,
+			inventorywindow_ejectslider->bottom() + padding
+		);
+		inventorywindow_ejectcancelbutton->set_size(ui::UI::elementsize);
+		inventorywindow_ejectcancelbutton->set_location(		
+			inventorywindow_ejectconfirmbutton->right() + padding,
+			inventorywindow_ejectslider->bottom() + padding
+		);
+	
+	}
 	
 }
 
@@ -298,7 +298,7 @@ void InventoryWindow::draw()
 	}
 	
 	std::stringstream str;
-	str << "Credits: " << std::setw(12) << core::localplayer()->credits();
+	str << "Credits: " << std::setw(10) << core::localplayer()->credits();
 
 	if (core::localcontrol() && core::localcontrol()->inventory()) {
 		core::Inventory *inventory = core::localcontrol()->inventory();
@@ -306,7 +306,7 @@ void InventoryWindow::draw()
 		std::stringstream cargostr;
 		cargostr << inventory->capacity_used() << " of " << inventory->capacity();
 		
-		str << '\n' << "Cargo:   " << aux::pad_left(cargostr.str(),12);
+		str << '\n' << "Cargo: " << aux::pad_left(cargostr.str(), 12);
 	}
 	inventorywindow_inventorytext->set_text(str.str());
 	
@@ -455,6 +455,7 @@ bool InventoryWindow::on_emit(Widget *sender, const Event event, void *data)
 				show_eject_dialog(inventorywindow_listview->selected()->info(), inventorywindow_listview->selected()->item()->amount());
 			}
 		} else if (sender == inventorywindow_ejectcancelbutton) {
+			inventorywindow_modelnamelabel->set_text("Cargo Info");
 			show_item_info(inventorywindow_listview->selected());
 		} else if (sender == inventorywindow_ejectconfirmbutton) {
 			act_eject();