Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-11-08 13:20:45 +0000
committerStijn Buys <ingar@osirion.org>2013-11-08 13:20:45 +0000
commitbeefcbd30e5cb1b700c977090021cd4784989c1e (patch)
tree354086869e69b72b5603a9a58485d1e09c373bd8 /src/client/inventorywindow.cc
parent3aa51da4ec976665a7e74bb659868d474400a101 (diff)
Added player reputation window,
minor cosmetic user interface changes.
Diffstat (limited to 'src/client/inventorywindow.cc')
-rw-r--r--src/client/inventorywindow.cc25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/client/inventorywindow.cc b/src/client/inventorywindow.cc
index 0a60259..2d8ac91 100644
--- a/src/client/inventorywindow.cc
+++ b/src/client/inventorywindow.cc
@@ -92,6 +92,7 @@ void InventoryWindow::toggle()
else
show();
}
+
void InventoryWindow::update_inventory()
{
const float icon_size = 24.0f; // small icons
@@ -225,25 +226,23 @@ void InventoryWindow::resize()
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);
-
+ // resize inventory text
inventorywindow_inventorytext->set_size(ui::UI::elementsize.width(), padding * 2.0f);
- inventorywindow_inventorytext->set_location(inventorywindow_listview->left(), padding * 3.0f);
+ inventorywindow_inventorytext->set_location(inventorywindow_titlelabel->left(), inventorywindow_titlelabel->bottom() + padding);
+ // resize inventory listview
+ inventorywindow_listview->set_location(inventorywindow_titlelabel->left(), inventorywindow_inventorytext->bottom() + padding);
+ inventorywindow_listview->set_size(ui::UI::elementsize.width(), height() - icon_size - padding * 3.0f - inventorywindow_inventorytext->bottom());
+
inventorywindow_shipbutton->set_size(icon_size, icon_size);
inventorywindow_shipbutton->set_location(inventorywindow_inventorytext->left(), height() - icon_size - padding);
inventorywindow_ejectbutton->set_size(icon_size, icon_size);
inventorywindow_ejectbutton->set_location(inventorywindow_inventorytext->right() - icon_size, height() - icon_size - padding);
-// inventorywindow_mountbutton->set_size(icon_size, icon_size);
-// inventorywindow_mountbutton->set_location(inventorywindow_ejectbutton->left() - icon_size - padding, height() - icon_size - padding);
-
// resize modelview
- inventorywindow_modelview->set_size( width() - inventorywindow_listview->right() - padding * 2.0f ,ui::UI::elementsize.width());
- inventorywindow_modelview->set_location(inventorywindow_listview->right() + padding, padding * 3.0f);
+ inventorywindow_modelview->set_size( width() - inventorywindow_inventorytext->right() - padding * 2.0f ,ui::UI::elementsize.width());
+ inventorywindow_modelview->set_location(inventorywindow_inventorytext->right() + padding, inventorywindow_inventorytext->top());
// modelview title label
inventorywindow_modelnamelabel->set_location(0, 0);
@@ -415,9 +414,9 @@ void InventoryWindow::set_info(const core::Info *info, const int amount)
inventorywindow_ejectslider->hide();
if (!info) {
- inventorywindow_modelview->clear();
- inventorywindow_modelnamelabel->set_text("");
- inventorywindow_modeltitlelabel->set_text("");
+ inventorywindow_modelview->clear();
+ inventorywindow_modelnamelabel->clear();
+ inventorywindow_modeltitlelabel->clear();
} else {
core::game()->request_info(info->id());
inventorywindow_modelview->set_modelname(info->modelname());