From: terencehill <piuntn@gmail.com>
Date: Sun, 14 Aug 2011 20:45:44 +0000 (+0200)
Subject: Allow zooming even if the image would have me.forcedAspect set to 0
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e5e3d2bbec4fbfffd56a70d778b9a3c4f83bcd04;p=xonotic%2Fxonotic-data.pk3dir.git

Allow zooming even if the image would have me.forcedAspect set to 0
---

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index c2a5e70b6..06d2ad31a 100644
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -91,21 +91,21 @@ void Image_updateAspect(entity me)
 				me.imgSize = eX + eY * (me.size_x / (asp * me.size_y));
 			}
 		}
+	}
 
-		if (me.zoomFactor)
-			me.imgSize = me.imgSize * me.zoomFactor;
-
-		if(me.imgSize_x > 1 || me.imgSize_y > 1)
-		{
-			me.zoomOffset_x = bound(0, me.zoomOffset_x, 1);
-			me.zoomOffset_y = bound(0, me.zoomOffset_y, 1);
-		}
-		else
-			me.zoomOffset = '0.5 0.5 0';
+	if (me.zoomFactor)
+		me.imgSize = me.imgSize * me.zoomFactor;
 
-		me.imgOrigin_x = 0.5 - me.zoomOffset_x * me.imgSize_x;
-		me.imgOrigin_y = 0.5 - me.zoomOffset_y * me.imgSize_y;
+	if(me.imgSize_x > 1 || me.imgSize_y > 1)
+	{
+		me.zoomOffset_x = bound(0, me.zoomOffset_x, 1);
+		me.zoomOffset_y = bound(0, me.zoomOffset_y, 1);
 	}
+	else
+		me.zoomOffset = '0.5 0.5 0';
+
+	me.imgOrigin_x = 0.5 - me.zoomOffset_x * me.imgSize_x;
+	me.imgOrigin_y = 0.5 - me.zoomOffset_y * me.imgSize_y;
 }
 float Image_drag_setStartPos(entity me, vector coords)
 {