mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Smaller 'overlay next' button for basic overlay

Browse Source 
(Android) Mouse can be used to control overlay now too - is crash-prone
though after too many mouse clicks - reason unknown right now
This commit is contained in:
twinaphex 2012-12-24 14:08:50 +01:00
parent eb6937a7bd
commit 8f86172e3f
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/native/jni/Android.mk
View File

@ -4,7 +4,7 @@ PERF_TEST := 1
HAVE_NEON := 1 HAVE_NEON := 1
HAVE_SINC := 1 HAVE_SINC := 1
HAVE_LOGGER := 1 HAVE_LOGGER := 1
DEBUG_INPUT := 0 DEBUG_INPUT := 1
include $(CLEAR_VARS) include $(CLEAR_VARS)

8
android/native/jni/input_android.c
View File

@ -393,7 +393,7 @@ static void android_input_poll(void *data)
float x = AMotionEvent_getX(event, motion_pointer); float x = AMotionEvent_getX(event, motion_pointer);
float y = AMotionEvent_getY(event, motion_pointer); float y = AMotionEvent_getY(event, motion_pointer);
if(source != AINPUT_SOURCE_TOUCHSCREEN) if(source != AINPUT_SOURCE_TOUCHSCREEN && source != AINPUT_SOURCE_MOUSE)
{ {
state[state_id] &= ~((1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) | (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) | state[state_id] &= ~((1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) | (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) |
(1ULL << RETRO_DEVICE_ID_JOYPAD_UP) | (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN)); (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) | (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN));
@ -407,7 +407,11 @@ static void android_input_poll(void *data)
} }
else else
{ {
if (action == AMOTION_EVENT_ACTION_UP || action == AMOTION_EVENT_ACTION_CANCEL || action == AMOTION_EVENT_ACTION_POINTER_UP) bool mouse_is_not_dirty = (source == AINPUT_SOURCE_MOUSE && action != AMOTION_EVENT_ACTION_DOWN);
bool pointer_is_not_dirty = (action == AMOTION_EVENT_ACTION_UP ||
action == AMOTION_EVENT_ACTION_CANCEL || action == AMOTION_EVENT_ACTION_POINTER_UP);
if (mouse_is_not_dirty || pointer_is_not_dirty)
pointer_dirty = 0; pointer_dirty = 0;
else else
{ {

2
media/overlays/basic_overlay.cfg
View File

@ -18,7 +18,7 @@ overlay0_desc10 = "b,200,237,radial,15,15"
overlay0_desc11 = "a,234,210,radial,15,15" overlay0_desc11 = "a,234,210,radial,15,15"
overlay0_desc12 = "x,200,180,radial,15,15" overlay0_desc12 = "x,200,180,radial,15,15"
overlay0_desc13 = "y,163,210,radial,15,15" overlay0_desc13 = "y,163,210,radial,15,15"
overlay0_desc14 = "overlay_next,111,224,radial,20,20" overlay0_desc14 = "overlay_next,116,240,radial,16,16"
overlay1_descs = 11 overlay1_descs = 11
overlay1_desc0 = "save_state,55,51,rect,50,7" overlay1_desc0 = "save_state,55,51,rect,50,7"

BIN
media/overlays/basic_overlay.tga
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 KiB

After

Width:  |  Height:  |  Size: 256 KiB