Support for inline graphics and mouse input on menus.

Menus in the console version should be unchanged.  Let me know if this is not the case.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7258 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 8 deletions

diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index 1c9dcf83f3..a9b921f1c8 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -430,13 +430,6 @@ public:
 protected:
     void draw_title();
     bool process_key(int key);
-
-    void draw_stock_item(int index, const MenuEntry *me) const
-    {
-        // Skip inventory draw function, as tiles code can't currently
-        // handle drawing items that aren't in mitm or in inventory.
-        Menu::draw_stock_item(index, me);
-    }
 };
 
 void StashMenu::draw_title()
@@ -1742,6 +1735,7 @@ void StashSearchMenu::draw_title()
     }
 }
 
+
 bool StashSearchMenu::process_key(int key)
 {
     if (key == '?')
@@ -1781,8 +1775,11 @@ bool StashTracker::display_search_results(
     stashmenu.set_title(mtitle);
 
     // Don't make a menu so tall that we recycle hotkeys on the same page.
-    if (results.size() > 52)
+    if (results.size() > 52
+        && (stashmenu.maxpagesize() > 52 || stashmenu.maxpagesize() == 0))
+    {
         stashmenu.set_maxpagesize(52);
+    }
 
     menu_letter hotkey;
     for (unsigned i = 0; i < results.size(); ++i, ++hotkey)