X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fmenu%2Fitem%2Finputcontainer.c;h=0f80c2b503dbd4a40a77d062470108035afc58f2;hb=0f0e69c6625fc4db17559e2e47f2fdaed8298076;hp=65129b294dd6c0229436da186734c244d30b6b6f;hpb=aa567df8fe657e09850b52f45dc7a939913ce7cb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/inputcontainer.c b/qcsrc/menu/item/inputcontainer.c
index 65129b294..0f80c2b50 100644
--- a/qcsrc/menu/item/inputcontainer.c
+++ b/qcsrc/menu/item/inputcontainer.c
@@ -56,7 +56,7 @@ float InputContainer_keyDown(entity me, float scan, float ascii, float shift)
 			{
 				for(ff = f.prevSibling; ff; ff = ff.prevSibling)
 				{
-					if not(ff.focusable)
+					if (!ff.focusable)
 						continue;
 					me.setFocus(me, ff);
 					return 1;
@@ -66,7 +66,7 @@ float InputContainer_keyDown(entity me, float scan, float ascii, float shift)
 			{
 				for(ff = me.lastChild; ff; ff = ff.prevSibling)
 				{
-					if not(ff.focusable)
+					if (!ff.focusable)
 						continue;
 					me.setFocus(me, ff);
 					return 1;
@@ -80,7 +80,7 @@ float InputContainer_keyDown(entity me, float scan, float ascii, float shift)
 			{
 				for(ff = f.nextSibling; ff; ff = ff.nextSibling)
 				{
-					if not(ff.focusable)
+					if (!ff.focusable)
 						continue;
 					me.setFocus(me, ff);
 					return 1;
@@ -90,7 +90,7 @@ float InputContainer_keyDown(entity me, float scan, float ascii, float shift)
 			{
 				for(ff = me.firstChild; ff; ff = ff.nextSibling)
 				{
-					if not(ff.focusable)
+					if (!ff.focusable)
 						continue;
 					me.setFocus(me, ff);
 					return 1;
@@ -108,7 +108,7 @@ float InputContainer__changeFocusXY(entity me, vector pos)
 	e = me.mouseFocusedChild;
 	ne = me.itemFromPoint(me, pos);
 	if(ne)
-		if not(ne.focusable)
+		if (!ne.focusable)
 			ne = NULL;
 	me.mouseFocusedChild = ne;
 	if(ne)
@@ -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;