Merge remote-tracking branch 'origin/master' into terencehill/menu_focus_stuff

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

diff --git a/qcsrc/menu/item/inputcontainer.c b/qcsrc/menu/item/inputcontainer.c
index e1b14d3b1602d468d08ccdf6b26ef0aaf48b43df..4531a1f4e11c2f4917baef0e9d03d4f5bb4ef6f1 100644 (file)
--- a/qcsrc/menu/item/inputcontainer.c
+++ b/qcsrc/menu/item/inputcontainer.c
@@ -134,6 +134,8 @@ float InputContainer_mouseDrag(entity me, vector pos)
 }
 float InputContainer_mouseMove(entity me, vector pos)
 {
+       if(me.mouseFocusedChild != me.focusedChild) // if the keyboard moved the focus away
+               me.mouseFocusedChild = NULL; // force focusing
        if(me._changeFocusXY(me, pos))
                if(SUPER(InputContainer).mouseMove(me, pos))
                        return 1;
@@ -153,8 +155,7 @@ float InputContainer_mousePress(entity me, vector pos)
 }
 float InputContainer_mouseRelease(entity me, vector pos)
 {
-       float r;
-       r = SUPER(InputContainer).mouseRelease(me, pos);
+       SUPER(InputContainer).mouseRelease(me, pos); // return value?
        if(me.focused) // am I still eligible for this? (UGLY HACK, but a mouse event could have changed focus away)
                if(me._changeFocusXY(me, pos))
                        return 1;