From 4c3dffd865cc7b27957f4516f46c5446dc4a6997 Mon Sep 17 00:00:00 2001 From: marynate Date: Sun, 13 Jul 2014 15:01:42 +0800 Subject: [PATCH 1/2] Fixed ios release event not been dispatched when app entering background (only first touch been registered in mouse_list) --- platform/iphone/os_iphone.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index 2ef732183b..ba93df994b 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -220,6 +220,8 @@ void OSIPhone::mouse_button(int p_idx, int p_x, int p_y, bool p_pressed, bool p_ ev.screen_touch.y=p_y; queue_event(ev); + mouse_list.pressed[p_idx] = p_pressed; + if (p_use_as_mouse) { InputEvent ev; @@ -238,8 +240,6 @@ void OSIPhone::mouse_button(int p_idx, int p_x, int p_y, bool p_pressed, bool p_ ev.mouse_button.doubleclick = p_doubleclick; ev.mouse_button.pressed = p_pressed; - mouse_list.pressed[p_idx] = p_pressed; - queue_event(ev); }; }; From 6a34ab201ab17363ce0d64d56469ff7fdd506c8c Mon Sep 17 00:00:00 2001 From: Franklin Sobrinho Date: Fri, 11 Dec 2015 10:15:05 -0300 Subject: [PATCH 2/2] Fix "in" operator, make it use evaluate() instead of operator== --- core/variant_op.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 1bcfa7d2ae..e33b79e63c 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -2635,7 +2635,7 @@ bool Variant::in(const Variant& p_index, bool *r_valid) const { if (l) { for(int i=0;i