Display the current zoom level on the screenshot

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index ade512b8575931571407059098e912510b645b43..b381b24b8de6edc1be070715e20db24d4707d5c4 100644 (file)
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -13,6 +13,7 @@ CLASS(Image) EXTENDS(Item)
        ATTRIB(Image, forcedAspect, float, 0)
        ATTRIB(Image, zoomFactor, float, 1)
        ATTRIB(Image, zoomOffset, vector, '0.5 0.5 0')
+       ATTRIB(Image, zoomTime, 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')
@@ -115,6 +116,8 @@ void Image_setZoom(entity me, float z, float atMousePosition)
                me.zoomOffset = '0.5 0.5 0';
        else if (atMousePosition && prev_zoomFactor != me.zoomFactor)
                me.zoomOffset = me.start_zoomOffset + (me.start_coords - '0.5 0.5 0') * (1/prev_zoomFactor);
+       if (prev_zoomFactor != me.zoomFactor)
+               me.zoomTime = time;
        me.updateAspect(me);
 }
 void Image_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)

diff --git a/qcsrc/menu/xonotic/screenshotimage.c b/qcsrc/menu/xonotic/screenshotimage.c
index 597b986aa7fc682a1fe8aea8d005f9a1e51635bd..dc8de42b58b0aa9a15ebc916360a6e8ebc72632c 100644 (file)
--- a/qcsrc/menu/xonotic/screenshotimage.c
+++ b/qcsrc/menu/xonotic/screenshotimage.c
@@ -62,6 +62,11 @@ void XonoticScreenshotImage_draw(entity me)
                        theAlpha = (4 - (time - me.screenshotTime));
                        draw_CenterText('0.5 0 0', me.screenshotTitle, me.realFontSize, '1 1 1', theAlpha, FALSE);
                }
+               if (time < me.zoomTime + 2) // 1 seconds at full alpha, 1 second fading out
+               {
+                       theAlpha = (2 - (time - me.zoomTime));
+                       draw_Text('0.05 0.95 0', strcat(ftos(me.zoomFactor * 100), "%"), me.realFontSize, '1 1 1', theAlpha, FALSE);
+               }
        }
 }