diff options
author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-06-20 12:13:37 +0200 |
---|---|---|
committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-06-20 17:14:54 +0200 |
commit | f77bc6957c1a43af22ae269c57ea0b6914e222b8 (patch) | |
tree | ddaf5bc597913acee5d46c669a94eb463e0cf149 /src/lib/ecore_evas | |
parent | ff97b0ed3dec3e156c9400dba745660643557fd2 (diff) |
efl_input_pointer: rename tool to touch_id
tool was not very helpfull, and additionally, the docuemtnation of it
was completly wrong. After searching through the code where tool was
actaully set (efl_ui_win.c) it turned out that it is actaully the "id"
of the pointer when there are multiple touch events.
ref T7963
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es>
Differential Revision: https://phab.enlightenment.org/D9135
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r-- | src/lib/ecore_evas/ecore_evas.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 599d7ec9e8..3e12ab5218 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c | |||
@@ -4819,7 +4819,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P | |||
4819 | if (info->double_click) ev->button_flags |= EFL_POINTER_FLAGS_DOUBLE_CLICK; | 4819 | if (info->double_click) ev->button_flags |= EFL_POINTER_FLAGS_DOUBLE_CLICK; |
4820 | if (info->triple_click) ev->button_flags |= EFL_POINTER_FLAGS_TRIPLE_CLICK; | 4820 | if (info->triple_click) ev->button_flags |= EFL_POINTER_FLAGS_TRIPLE_CLICK; |
4821 | ev->timestamp = info->timestamp; | 4821 | ev->timestamp = info->timestamp; |
4822 | ev->tool = info->multi.device; | 4822 | ev->touch_id = info->multi.device; |
4823 | _pointer_position_set(ev, ee, info->x, info->y, info->multi.x, info->multi.y); | 4823 | _pointer_position_set(ev, ee, info->x, info->y, info->multi.x, info->multi.y); |
4824 | ev->radius = info->multi.radius; | 4824 | ev->radius = info->multi.radius; |
4825 | ev->radius_x = info->multi.radius_x; | 4825 | ev->radius_x = info->multi.radius_x; |
@@ -4880,7 +4880,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info) | |||
4880 | 4880 | ||
4881 | ev->action = EFL_POINTER_ACTION_MOVE; | 4881 | ev->action = EFL_POINTER_ACTION_MOVE; |
4882 | ev->timestamp = info->timestamp; | 4882 | ev->timestamp = info->timestamp; |
4883 | ev->tool = info->multi.device; | 4883 | ev->touch_id = info->multi.device; |
4884 | _pointer_position_set(ev, ee, info->x, info->y, info->multi.x, info->multi.y); | 4884 | _pointer_position_set(ev, ee, info->x, info->y, info->multi.x, info->multi.y); |
4885 | 4885 | ||
4886 | ev->radius = info->multi.radius; | 4886 | ev->radius = info->multi.radius; |
@@ -4996,7 +4996,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info) | |||
4996 | 4996 | ||
4997 | ev->action = EFL_POINTER_ACTION_AXIS; | 4997 | ev->action = EFL_POINTER_ACTION_AXIS; |
4998 | ev->timestamp = info->timestamp; | 4998 | ev->timestamp = info->timestamp; |
4999 | ev->tool = info->toolid; | 4999 | ev->touch_id = info->toolid; |
5000 | 5000 | ||
5001 | // see also evas_events.c | 5001 | // see also evas_events.c |
5002 | for (n = 0; n < info->naxis; n++) | 5002 | for (n = 0; n < info->naxis; n++) |