From 48ac91f6da68bc9bf9ee0f0b0d53d9f7c1787333 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 21 Jan 2012 22:54:07 +0100 Subject: [PATCH] After a menu item has lost the focus by pressing TAB, put the focus again on that item on mouse move --- qcsrc/menu/item/inputcontainer.c | 2 ++ qcsrc/menu/item/nexposee.c | 2 +- qcsrc/menu/xonotic/charmap.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qcsrc/menu/item/inputcontainer.c b/qcsrc/menu/item/inputcontainer.c index e1b14d3b1..f1529752e 100644 --- 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; diff --git a/qcsrc/menu/item/nexposee.c b/qcsrc/menu/item/nexposee.c index 02f122425..ef4b17d0e 100644 --- a/qcsrc/menu/item/nexposee.c +++ b/qcsrc/menu/item/nexposee.c @@ -263,7 +263,7 @@ float Nexposee_mouseMove(entity me, vector pos) if(me.animationState == 0) { if(me.mouseFocusedChild) - if(me.mouseFocusedChild != e) + if(me.mouseFocusedChild != e || me.mouseFocusedChild != me.selectedChild) me.selectedChild = me.mouseFocusedChild; return 1; } diff --git a/qcsrc/menu/xonotic/charmap.c b/qcsrc/menu/xonotic/charmap.c index 0e375c9cc..6966aaf48 100644 --- a/qcsrc/menu/xonotic/charmap.c +++ b/qcsrc/menu/xonotic/charmap.c @@ -64,7 +64,7 @@ float XonoticCharmap_mouseMove(entity me, vector coords) return 0; } c = y * 16 + x; - if(c != me.mouseSelectedCharacterCell) + if(c != me.mouseSelectedCharacterCell || me.mouseSelectedCharacterCell != me.selectedCharacterCell) me.mouseSelectedCharacterCell = me.selectedCharacterCell = c; return 1; } -- 2.39.2