summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2009-10-28 20:25:05 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:17:13 +0000
commitf9da8712126c8a377feb40989f30726c1f8974df (patch)
tree708501b2f5a58f08a094d5c49619409c7ed56de4 /src
parentaffe24fa3b3cb08c396d94f9e88c404d26da7ddc (diff)
* Do 1879 (tabbing out of an editfield hides the mouse) in a different way that doesn't partly break r1837 (tab, uparrow, downarrow sends chat text)
Diffstat (limited to 'src')
-rw-r--r--src/ui/ui_shared.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c
index 2ea3e1ca..3a614e08 100644
--- a/src/ui/ui_shared.c
+++ b/src/ui/ui_shared.c
@@ -3451,12 +3451,13 @@ qboolean Item_TextField_HandleKey( itemDef_t *item, int key )
case K_KP_UPARROW:
newItem = Menu_SetNextCursorItem( item->parent );
- if( newItem && ( newItem->type == ITEM_TYPE_EDITFIELD || newItem->type == ITEM_TYPE_NUMERICFIELD ) )
+ if( newItem && ( newItem->type == ITEM_TYPE_EDITFIELD ||
+ newItem->type == ITEM_TYPE_NUMERICFIELD ) )
g_editItem = newItem;
- else
+ else if( newItem ) // restore mouse if not using an editfield anymore
{
- releaseFocus = qtrue;
- goto exit;
+ g_editingField = qfalse;
+ g_waitingForKey = qfalse;
}
break;