summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg-map.cc
diff options
context:
space:
mode:
authorChris West <therealchriswest@hotmail.com>2012-12-29 16:17:48 +0000
committerChris West <therealchriswest@hotmail.com>2013-01-05 16:25:23 +0000
commit10e7a704c28f35be409b468c5881b81ed1c452a8 (patch)
tree0bba7a6daaee7fe3a23ed741bdc8e575c5e34962 /crawl-ref/source/tilereg-map.cc
parentd11e3248a35dcfb6ad16f5dc28db7a0b8ad0c8d5 (diff)
downloadcrawl-ref-10e7a704c28f35be409b468c5881b81ed1c452a8.tar.gz
crawl-ref-10e7a704c28f35be409b468c5881b81ed1c452a8.zip
merge of small-screen changes from old build env
Diffstat (limited to 'crawl-ref/source/tilereg-map.cc')
-rw-r--r--crawl-ref/source/tilereg-map.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/crawl-ref/source/tilereg-map.cc b/crawl-ref/source/tilereg-map.cc
index 079d993ef1..3ccdefd98d 100644
--- a/crawl-ref/source/tilereg-map.cc
+++ b/crawl-ref/source/tilereg-map.cc
@@ -270,6 +270,13 @@ int MapRegion::handle_mouse(MouseEvent &event)
return 0;
case MouseEvent::PRESS:
#ifdef TOUCH_UI
+ // ctrl-rolley-wheel on the minimap (this ensures busting out of minimap when zooming in again on very small layouts)
+ if ( (event.mod & MOD_CTRL)
+ && (event.button == MouseEvent::SCROLL_UP || event.button == MouseEvent::SCROLL_DOWN))
+ {
+ tiles.zoom_dungeon(event.button == MouseEvent::SCROLL_UP);
+ return CK_NO_KEY; // prevents this being handled by the dungeon underneath too(!)
+ }
if (event.button == MouseEvent::LEFT)
{
m_far_view = true;