summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-11 13:05:58 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-11 17:53:51 +0900
commit5b4bb7f34195614a7100f046afead64a12f6ec51 (patch)
treead372ca64bc5aa5352f064f8ab95ab9719f60048 /src/lib/ecore_evas
parent70821182ff460f63171e11ea45d249ad903510c7 (diff)
ecore_evas: Use proper enum values in axis events
Somehow the evas enum values were used instead of the ecore ones. But I believe this is just a cosmetic change as their integral values was the same.
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/ecore_evas.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 124305f431..7c68126157 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -4655,19 +4655,19 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4655 const Ecore_Axis *axis = &(info->axis[n]); 4655 const Ecore_Axis *axis = &(info->axis[n]);
4656 switch (axis->label) 4656 switch (axis->label)
4657 { 4657 {
4658 case EVAS_AXIS_LABEL_WINDOW_X: 4658 case ECORE_AXIS_LABEL_WINDOW_X:
4659 _efl_input_value_mark(ev, EFL_INPUT_VALUE_X); 4659 _efl_input_value_mark(ev, EFL_INPUT_VALUE_X);
4660 x = axis->value; 4660 x = axis->value;
4661 haswinx = EINA_TRUE; 4661 haswinx = EINA_TRUE;
4662 break; 4662 break;
4663 4663
4664 case EVAS_AXIS_LABEL_WINDOW_Y: 4664 case ECORE_AXIS_LABEL_WINDOW_Y:
4665 _efl_input_value_mark(ev, EFL_INPUT_VALUE_Y); 4665 _efl_input_value_mark(ev, EFL_INPUT_VALUE_Y);
4666 y = axis->value; 4666 y = axis->value;
4667 haswiny = EINA_TRUE; 4667 haswiny = EINA_TRUE;
4668 break; 4668 break;
4669 4669
4670 case EVAS_AXIS_LABEL_X: 4670 case ECORE_AXIS_LABEL_X:
4671 if (!haswinx) 4671 if (!haswinx)
4672 { 4672 {
4673 _efl_input_value_mark(ev, EFL_INPUT_VALUE_X); 4673 _efl_input_value_mark(ev, EFL_INPUT_VALUE_X);
@@ -4677,7 +4677,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4677 ev->has_raw = EINA_TRUE; 4677 ev->has_raw = EINA_TRUE;
4678 break; 4678 break;
4679 4679
4680 case EVAS_AXIS_LABEL_Y: 4680 case ECORE_AXIS_LABEL_Y:
4681 if (!haswiny) 4681 if (!haswiny)
4682 { 4682 {
4683 _efl_input_value_mark(ev, EFL_INPUT_VALUE_Y); 4683 _efl_input_value_mark(ev, EFL_INPUT_VALUE_Y);
@@ -4687,46 +4687,46 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4687 ev->has_raw = EINA_TRUE; 4687 ev->has_raw = EINA_TRUE;
4688 break; 4688 break;
4689 4689
4690 case EVAS_AXIS_LABEL_NORMAL_X: 4690 case ECORE_AXIS_LABEL_NORMAL_X:
4691 ev->norm.x = axis->value; 4691 ev->norm.x = axis->value;
4692 ev->has_norm = EINA_TRUE; 4692 ev->has_norm = EINA_TRUE;
4693 break; 4693 break;
4694 4694
4695 case EVAS_AXIS_LABEL_NORMAL_Y: 4695 case ECORE_AXIS_LABEL_NORMAL_Y:
4696 ev->norm.y = axis->value; 4696 ev->norm.y = axis->value;
4697 ev->has_norm = EINA_TRUE; 4697 ev->has_norm = EINA_TRUE;
4698 break; 4698 break;
4699 4699
4700 case EVAS_AXIS_LABEL_PRESSURE: 4700 case ECORE_AXIS_LABEL_PRESSURE:
4701 _efl_input_value_mark(ev, EFL_INPUT_VALUE_PRESSURE); 4701 _efl_input_value_mark(ev, EFL_INPUT_VALUE_PRESSURE);
4702 ev->pressure = axis->value; 4702 ev->pressure = axis->value;
4703 break; 4703 break;
4704 4704
4705 case EVAS_AXIS_LABEL_DISTANCE: 4705 case ECORE_AXIS_LABEL_DISTANCE:
4706 _efl_input_value_mark(ev, EFL_INPUT_VALUE_DISTANCE); 4706 _efl_input_value_mark(ev, EFL_INPUT_VALUE_DISTANCE);
4707 ev->distance = axis->value; 4707 ev->distance = axis->value;
4708 break; 4708 break;
4709 4709
4710 case EVAS_AXIS_LABEL_AZIMUTH: 4710 case ECORE_AXIS_LABEL_AZIMUTH:
4711 _efl_input_value_mark(ev, EFL_INPUT_VALUE_AZIMUTH); 4711 _efl_input_value_mark(ev, EFL_INPUT_VALUE_AZIMUTH);
4712 ev->azimuth = axis->value; 4712 ev->azimuth = axis->value;
4713 break; 4713 break;
4714 4714
4715 case EVAS_AXIS_LABEL_TILT: 4715 case ECORE_AXIS_LABEL_TILT:
4716 _efl_input_value_mark(ev, EFL_INPUT_VALUE_TILT); 4716 _efl_input_value_mark(ev, EFL_INPUT_VALUE_TILT);
4717 ev->tilt = axis->value; 4717 ev->tilt = axis->value;
4718 break; 4718 break;
4719 4719
4720 case EVAS_AXIS_LABEL_TWIST: 4720 case ECORE_AXIS_LABEL_TWIST:
4721 _efl_input_value_mark(ev, EFL_INPUT_VALUE_TWIST); 4721 _efl_input_value_mark(ev, EFL_INPUT_VALUE_TWIST);
4722 ev->twist = axis->value; 4722 ev->twist = axis->value;
4723 break; 4723 break;
4724 4724
4725 case EVAS_AXIS_LABEL_UNKNOWN: 4725 case ECORE_AXIS_LABEL_UNKNOWN:
4726 case EVAS_AXIS_LABEL_TOUCH_WIDTH_MAJOR: 4726 case ECORE_AXIS_LABEL_TOUCH_WIDTH_MAJOR:
4727 case EVAS_AXIS_LABEL_TOUCH_WIDTH_MINOR: 4727 case ECORE_AXIS_LABEL_TOUCH_WIDTH_MINOR:
4728 case EVAS_AXIS_LABEL_TOOL_WIDTH_MAJOR: 4728 case ECORE_AXIS_LABEL_TOOL_WIDTH_MAJOR:
4729 case EVAS_AXIS_LABEL_TOOL_WIDTH_MINOR: 4729 case ECORE_AXIS_LABEL_TOOL_WIDTH_MINOR:
4730 default: 4730 default:
4731 DBG("Unsupported axis label %d, value %f (discarded)", 4731 DBG("Unsupported axis label %d, value %f (discarded)",
4732 axis->label, axis->value); 4732 axis->label, axis->value);