maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7721 from RandomShaper/improve-touch-button-2.1

Browse source 
Fix touch button issues (2.1)
This commit is contained in:
Rémi Verschelde 2017-02-12 23:12:14 +01:00 committed by GitHub
parent 4e9f88b649 c0f7b80b89
commit 3b09d77208
2 changed files with 58 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
scene/2d/screen_button.cpp
View file

@ -145,8 +145,12 @@ void TouchScreenButton::_notification(int p_what) {
} break;
case NOTIFICATION_EXIT_TREE: {
if (is_pressed())
Input::get_singleton()->action_release(action);
_release(true);
} break;
case NOTIFICATION_PAUSED: {
// So the button can be pressed again even though the release gets unhandled because of coming during pause
allow_repress=true;
}
}
}
@ -184,22 +188,7 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
if (p_event.type==InputEvent::SCREEN_TOUCH && !p_event.screen_touch.pressed && finger_pressed==p_event.screen_touch.index) {
emit_signal("released");
if (action_id!=-1) {
Input::get_singleton()->action_release(action);
InputEvent ie;
ie.type=InputEvent::ACTION;
ie.ID=0;
ie.action.action=action_id;
ie.action.pressed=false;
get_tree()->input_event(ie);
}
finger_pressed=-1;
update();
_release();
}
if ((p_event.type==InputEvent::SCREEN_TOUCH && p_event.screen_touch.pressed)|| p_event.type==InputEvent::SCREEN_DRAG) {
@ -225,44 +214,12 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
if (touched) {
if (finger_pressed==-1) {
finger_pressed=p_event.screen_touch.index;
//emit change stuff
emit_signal("pressed");
if (action_id!=-1) {
Input::get_singleton()->action_press(action);
InputEvent ie;
ie.type=InputEvent::ACTION;
ie.ID=0;
ie.action.action=action_id;
ie.action.pressed=true;
get_tree()->input_event(ie);
}
update();
_press(p_event.screen_touch.index);
}
} else {
if (finger_pressed!=-1) {
emit_signal("released");
if (action_id!=-1) {
Input::get_singleton()->action_release(action);
InputEvent ie;
ie.type=InputEvent::ACTION;
ie.ID=0;
ie.action.action=action_id;
ie.action.pressed=false;
get_tree()->input_event(ie);
}
finger_pressed=-1;
update();
_release();
}
}
@ -280,7 +237,8 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
if (!is_visible())
return;
if (finger_pressed!=-1)
const bool can_press=finger_pressed==-1 || allow_repress;
if (!can_press)
return; //already fingering
Point2 coord = (get_global_transform_with_canvas()).affine_inverse().xform(Point2(p_event.screen_touch.x,p_event.screen_touch.y));
@ -311,51 +269,59 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
}
if (touched) {
finger_pressed=p_event.screen_touch.index;
//emit change stuff
emit_signal("pressed");
if (action_id!=-1) {
Input::get_singleton()->action_press(action);
InputEvent ie;
ie.type=InputEvent::ACTION;
ie.ID=0;
ie.action.action=action_id;
ie.action.pressed=true;
get_tree()->input_event(ie);
}
update();
_press(p_event.screen_touch.index);
}
} else {
if (p_event.screen_touch.index==finger_pressed) {
//untouch
emit_signal("released");
if (action_id!=-1) {
Input::get_singleton()->action_release(action);
InputEvent ie;
ie.type=InputEvent::ACTION;
ie.ID=0;
ie.action.action=action_id;
ie.action.pressed=false;
get_tree()->input_event(ie);
}
finger_pressed=-1;
update();
_release();
}
}
}
}
}
void TouchScreenButton::_press(int p_finger_pressed) {
finger_pressed=p_finger_pressed;
allow_repress=false;
if (action_id!=-1) {
Input::get_singleton()->action_press(action);
InputEvent ie;
ie.type=InputEvent::ACTION;
ie.ID=0;
ie.action.action=action_id;
ie.action.pressed=true;
get_tree()->input_event(ie);
}
emit_signal("pressed");
update();
}
void TouchScreenButton::_release(bool p_exiting_tree) {
finger_pressed=-1;
if (action_id!=-1) {
Input::get_singleton()->action_release(action);
InputEvent ie;
ie.type=InputEvent::ACTION;
ie.ID=0;
ie.action.action=action_id;
ie.action.pressed=false;
get_tree()->input_event(ie);
}
if (!p_exiting_tree) {
emit_signal("released");
update();
}
}
Rect2 TouchScreenButton::get_item_rect() const {
if (texture.is_null())
@ -438,6 +404,7 @@ void TouchScreenButton::_bind_methods() {
TouchScreenButton::TouchScreenButton() {
finger_pressed=-1;
allow_repress=false;
action_id=-1;
passby_press=false;
visibility=VISIBILITY_ALWAYS;

4
scene/2d/screen_button.h
View file

@ -56,12 +56,16 @@ private:
StringName action;
bool passby_press;
int finger_pressed;
bool allow_repress;
int action_id;
VisibilityMode visibility;
void _input(const InputEvent& p_Event);
void _press(int p_finger_pressed);
void _release(bool p_exiting_tree=false);
protected:
void _notification(int p_what);