Merge branch 'master' into terencehill/misc_bugfixes

diff --git a/qcsrc/menu/draw.qc b/qcsrc/menu/draw.qc
index cec73d6c0a2f146d89b9298e21723d0976694442..1bda59583bb2dad9c7566657ea33b98de5040bfb 100644 (file)
--- a/qcsrc/menu/draw.qc
+++ b/qcsrc/menu/draw.qc
@@ -167,6 +167,12 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the
        vector dX, dY;
        vector width, height;
        vector bW, bH;
+       if (theBorderSize_x <= 0 && theBorderSize_y <= 0) // no border
+       {
+               // draw only the central part
+               drawsubpic(theOrigin, theSize, pic, '0.25 0.25 0', '0.5 0.5 0', theColor, theAlpha, 0);
+               return;
+       }
        pic = draw_UseSkinFor(pic);
        theOrigin = boxToGlobal(theOrigin, draw_shift, draw_scale);
        theSize = boxToGlobalSize(theSize, draw_scale);

diff --git a/qcsrc/menu/item/borderimage.c b/qcsrc/menu/item/borderimage.c
index 236b2352221259a98b0e5604b4e3e2b06180b5c9..1fdec60ef7f8ca9b100d0cd75a4a988e03530abe 100644 (file)
--- a/qcsrc/menu/item/borderimage.c
+++ b/qcsrc/menu/item/borderimage.c
@@ -42,7 +42,7 @@ void BorderImage_resizeNotify(entity me, vector relOrigin, vector relSize, vecto
        {
                // move the close button to the right place
                me.closeButton.Container_origin = '1 0 0' * (1 - me.borderVec_x);
-               me.closeButton.Container_size = me.borderVec;
+               me.closeButton.Container_size = (me.borderHeight > 0) ? me.borderVec : 0.0001 * '1 1 0'; //workaround to not draw a big closebutton if borderHeight is 0
                me.closeButton.color = me.color;
                me.closeButton.colorC = me.color;
                me.closeButton.colorF = me.color;