From b8798b05c76ef36c1734ed71848264e5e7eeb8e8 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 14 Aug 2011 01:09:11 +0200 Subject: [PATCH] Properly limit image dragging --- qcsrc/menu/item/image.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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; -- 2.39.2