diff options
| author | Tim Angus <tim@ngus.net> | 2009-12-23 01:40:43 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:24 +0000 |
| commit | 5203e6a41dbe296102e1852b42dc2cdcd55b5408 (patch) | |
| tree | 6382e9a7cb9d9558b98bb5867a10d27875f0bf58 /src | |
| parent | 43770d569cd5a1fb8093b01f961c94ffdb607b3d (diff) | |
* Make cursor hiding more consistent
Diffstat (limited to 'src')
| -rw-r--r-- | src/sdl/sdl_input.c | 2 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c index 731aca72..ec96b086 100644 --- a/src/sdl/sdl_input.c +++ b/src/sdl/sdl_input.c @@ -535,7 +535,7 @@ static void IN_DeactivateMouse( void ) if( !r_fullscreen->integer ) { if( ( Key_GetCatcher( ) == KEYCATCH_UI ) && - ( SDL_GetAppState( ) & (SDL_APPMOUSEFOCUS|SDL_APPINPUTFOCUS) ) == (SDL_APPMOUSEFOCUS|SDL_APPINPUTFOCUS) ) + ( SDL_GetAppState( ) & SDL_APPMOUSEFOCUS ) ) SDL_ShowCursor( 0 ); else SDL_ShowCursor( 1 ); diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index b28471d9..b4e4a82c 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -1187,7 +1187,7 @@ void UI_Refresh( int realtime ) // draw cursor UI_SetColor( NULL ); - if( Menu_Count( ) > 0 && !trap_Cvar_VariableValue( "ui_hideCursor" ) ) + if( trap_Key_GetCatcher( ) == KEYCATCH_UI && !trap_Cvar_VariableValue( "ui_hideCursor" ) ) { UI_DrawHandlePic( uiInfo.uiDC.cursorx - ( 16.0f * uiInfo.uiDC.aspectScale ), uiInfo.uiDC.cursory - 16.0f, 32.0f * uiInfo.uiDC.aspectScale, 32.0f, uiInfo.uiDC.Assets.cursor ); |