From: terencehill <piuntn@gmail.com>
Date: Sat, 13 Aug 2011 23:09:11 +0000 (+0200)
Subject: Properly limit image dragging
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~27
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b8798b05c76ef36c1734ed71848264e5e7eeb8e8;p=xonotic%2Fxonotic-data.pk3dir.git

Properly limit image dragging
---

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index 31fe8d094..f05826d9d 100644
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -93,21 +93,21 @@ void Image_updateAspect(entity me)
 		}
 
 		if (me.zoomFactor)
-		{
-			if (me.zoomFactor > 1)
-			{
-				me.zoomOffset_x = bound(0, me.zoomOffset_x, 1);
-				me.zoomOffset_y = bound(0, me.zoomOffset_y, 1);
-			}
 			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);
 		}
+
 		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)
 {
-	//if (me.zoomFactor > 1) //mousewheel zoom may start from a non-zoomed-in image
+	//if(me.imgSize_x > 1 || me.imgSize_y > 1) // check disabled: mousewheel zoom may start from a non-zoomed-in image
 	{
 		me.start_zoomOffset = me.zoomOffset;
 		me.start_coords = coords;