From e4127aa491fa39eac68b43fc5fd4c4301d085200 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Dec 2014 19:04:53 +0100
Subject: [PATCH] Use space in ItemView more efficiently

---
 apps/openmw/mwgui/itemview.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp
index a51ada2754..6af6a3b3f6 100644
--- a/apps/openmw/mwgui/itemview.cpp
+++ b/apps/openmw/mwgui/itemview.cpp
@@ -53,9 +53,14 @@ void ItemView::layoutWidgets()
 
     int x = 0;
     int y = 0;
-    int maxHeight = mScrollView->getSize().height - 58;
-
     MyGUI::Widget* dragArea = mScrollView->getChildAt(0);
+    int maxHeight = dragArea->getHeight();
+
+    int rows = maxHeight/42;
+    rows = std::max(rows, 1);
+    bool showScrollbar = std::ceil(dragArea->getChildCount()/float(rows)) > mScrollView->getWidth()/42;
+    if (showScrollbar)
+        maxHeight -= 18;
 
     for (unsigned int i=0; i<dragArea->getChildCount(); ++i)
     {
@@ -64,7 +69,8 @@ void ItemView::layoutWidgets()
         w->setPosition(x, y);
 
         y += 42;
-        if (y > maxHeight)
+
+        if (y > maxHeight-42 && i < dragArea->getChildCount()-1)
         {
             x += 42;
             y = 0;