From 5cde976f7ec32f6a8fdb35a0a861b6a90e8e6c72 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Thu, 2 Aug 2012 17:18:58 +0100
Subject: [PATCH] Fix zoom in deco mode

---
 src/interface.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/interface.c b/src/interface.c
index c08534d49..92c77b88b 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -6121,11 +6121,21 @@ unsigned int decorations_ui(pixel *vid_buf,int *bsx,int *bsy, unsigned int saved
 		{
 			zoom_en = 0;
 		}
-		if (sdl_key=='z' && zoom_en==2)
+		if (sdl_key=='z')
 		{
-			zoom_en = 1;
-			hidden = 1;
+			if (sdl_mod & KMOD_ALT)//toggle
+				sdl_zoom_trig = (!sdl_zoom_trig)*2;
+			else
+				sdl_zoom_trig = 1;
 		}
+		if (sdl_rkey == 'z' && sdl_zoom_trig==1)//if ==2 then it was toggled with alt+z, don't turn off on keyup
+				sdl_zoom_trig = 0;
+
+		if (!sdl_zoom_trig && zoom_en==1)
+			zoom_en = 0;
+
+		if (sdl_key=='z' && zoom_en==2)
+			zoom_en = 1;
 
 		if(sdl_key=='b' || sdl_key==SDLK_ESCAPE)
 		{