Merge commit 'origin/master' into diabolik/nexmodel

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item / image.c

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index 4e252d8d2226e14ee02eb470ea693715d5bdbe45..c64561b39b4d0e2f625cab044956fae9408db48c 100644 (file)
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -4,6 +4,7 @@ CLASS(Image) EXTENDS(Item)
        METHOD(Image, draw, void(entity))
        METHOD(Image, toString, string(entity))
        METHOD(Image, resizeNotify, void(entity, vector, vector, vector, vector))
+       METHOD(Image, updateAspect, void(entity))
        ATTRIB(Image, src, string, string_null)
        ATTRIB(Image, color, vector, '1 1 1')
        ATTRIB(Image, forcedAspect, float, 0)
@@ -13,21 +14,23 @@ ENDCLASS(Image)
 #endif
 
 #ifdef IMPLEMENTATION
-string toStringImage(entity me)
+string Image_toString(entity me)
 {
        return me.src;
 }
-void configureImageImage(entity me, string path)
+void Image_configureImage(entity me, string path)
 {
        me.src = path;
 }
-void drawImage(entity me)
+void Image_draw(entity me)
 {
        draw_Picture(me.imgOrigin, me.src, me.imgSize, me.color, 1);
 }
-void resizeNotifyImage(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Image_updateAspect(entity me)
 {
-       resizeNotifyItem(me, relOrigin, relSize, absOrigin, absSize);
+       float asp;
+       if(me.size_x <= 0 || me.size_y <= 0)
+               return;
        if(me.forcedAspect == 0)
        {
                me.imgOrigin = '0 0 0';
@@ -35,17 +38,30 @@ void resizeNotifyImage(entity me, vector relOrigin, vector relSize, vector absOr
        }
        else
        {
-               if(absSize_x > me.forcedAspect * absSize_y)
+               if(me.forcedAspect < 0)
+               {
+                       vector sz;
+                       sz = draw_PictureSize(me.src);
+                       asp = sz_x / sz_y;
+               }
+               else
+                       asp = me.forcedAspect;
+               if(me.size_x > asp * me.size_y)
                {
                        // x too large, so center x-wise
-                       me.imgSize = eY + eX * (absSize_y * me.forcedAspect / absSize_x);
+                       me.imgSize = eY + eX * (me.size_y * asp / me.size_x);
                }
                else
                {
                        // y too large, so center y-wise
-                       me.imgSize = eX + eY * (absSize_x / (me.forcedAspect * absSize_y));
+                       me.imgSize = eX + eY * (me.size_x / (asp * me.size_y));
                }
                me.imgOrigin = '0.5 0.5 0' - 0.5 * me.imgSize;
        }
 }
+void Image_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+{
+       SUPER(Image).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
+       me.updateAspect(me);
+}
 #endif