zoomLimitedByTheBox if set forbids zooming in if the image would be larger than the...

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index 06d2ad31a10370073975ad69e24e0ffde1ea5f5d..c424ad06a4a501f61121798bf48a6ca5e07af6d5 100644 (file)
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -15,6 +15,8 @@ CLASS(Image) EXTENDS(Item)
        ATTRIB(Image, zoomFactor, float, 1)
        ATTRIB(Image, zoomOffset, vector, '0.5 0.5 0')
        ATTRIB(Image, zoomTime, float, 0)
+       ATTRIB(Image, zoomLimitedByTheBox, float, 0) // forbids zoom if image would be larger than the containing box
+       ATTRIB(Image, zoomMax, float, 0)
        ATTRIB(Image, start_zoomOffset, vector, '0 0 0')
        ATTRIB(Image, start_coords, vector, '0 0 0')
        ATTRIB(Image, imgOrigin, vector, '0 0 0')
@@ -34,6 +36,8 @@ void Image_configureImage(entity me, string path)
        me.zoomFactor = 1;
        if (me.forcedAspect == -2)
                me.initialForcedZoom = -1; // calculate initialForcedZoom at the first updateAspect call
+       if (me.zoomLimitedByTheBox)
+               me.zoomMax = -1; // calculate zoomMax at the first updateAspect call
 }
 void Image_draw(entity me)
 {
@@ -93,6 +97,21 @@ void Image_updateAspect(entity me)
                }
        }
 
+       if (me.zoomMax < 0)
+       {
+               if(me.initialForcedZoom > 0)
+                       me.zoomMax = me.initialForcedZoom;
+               else
+               {
+                       if(me.size_x > asp * me.size_y)
+                               me.zoomMax = (me.size_y * asp / me.size_x) / me.imgSize_x;
+                       else
+                               me.zoomMax = (me.size_x / (asp * me.size_y)) / me.imgSize_y;
+               }
+       }
+
+       if (me.zoomMax > 0 && me.zoomFactor > me.zoomMax)
+               me.zoomFactor = me.zoomMax;
        if (me.zoomFactor)
                me.imgSize = me.imgSize * me.zoomFactor;
 
@@ -159,6 +178,8 @@ void Image_setZoom(entity me, float z, float atMousePosition)
        else // directly set
                me.zoomFactor = z;
        me.zoomFactor = bound(1/16, me.zoomFactor, 16);
+       if (me.zoomFactor > me.zoomMax)
+               me.zoomFactor = me.zoomMax;
        if (prev_zoomFactor != me.zoomFactor)
        {
                me.zoomTime = time;

diff --git a/qcsrc/menu/xonotic/screenshotimage.c b/qcsrc/menu/xonotic/screenshotimage.c
index 1a5561d4cd5102263c4211621bb9fb75bae7fcc3..fa6be93f23bcad7dd3511d3f80b200e866952a6f 100644 (file)
--- a/qcsrc/menu/xonotic/screenshotimage.c
+++ b/qcsrc/menu/xonotic/screenshotimage.c
@@ -29,6 +29,7 @@ void XonoticScreenshotImage_configureXonoticScreenshotImage(entity me, string th
 {
        me.configureImage(me, theImage);
        me.forcedAspect = -2;
+       //me.zoomLimitedByTheBox = 1;
        me.screenshotTime = time;
        me.updateAspect(me);
        if (me.screenshotTitle)