From: terencehill <piuntn@gmail.com>
Date: Sun, 14 Aug 2011 17:43:00 +0000 (+0200)
Subject: Small cleanup + comment
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc36db82bc75b2eb318b2345fcca431424284c14;p=xonotic%2Fxonotic-data.pk3dir.git

Small cleanup + comment
---

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index 1d94381a5..c2a5e70b6 100644
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -159,13 +159,18 @@ void Image_setZoom(entity me, float z, float atMousePosition)
 	else // directly set
 		me.zoomFactor = z;
 	me.zoomFactor = bound(1/16, me.zoomFactor, 16);
-	if (atMousePosition && prev_zoomFactor != me.zoomFactor)
-	{
-		me.zoomOffset_x = me.start_zoomOffset_x + (me.start_coords_x - 0.5) / me.imgSize_x;
-		me.zoomOffset_y = me.start_zoomOffset_y + (me.start_coords_y - 0.5) / me.imgSize_y;
-	}
 	if (prev_zoomFactor != me.zoomFactor)
+	{
 		me.zoomTime = time;
+		if (atMousePosition)
+		{
+			me.zoomOffset_x = me.start_zoomOffset_x + (me.start_coords_x - 0.5) / me.imgSize_x;
+			me.zoomOffset_y = me.start_zoomOffset_y + (me.start_coords_y - 0.5) / me.imgSize_y;
+			// updateAspect will reset however zoomOffset to '0.5 0.5 0' if with
+			// this zoomFactor the image will not be zoomed (updateAspect will check
+			// the new values of imgSize).
+		}
+	}
 	me.updateAspect(me);
 }
 void Image_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)