diff options
author | Hosang Kim <hosang12.kim@samsung.com> | 2017-07-20 15:21:34 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-07-20 15:28:32 +0900 |
commit | 05e3e450e5ecb67f80c1be3df8ab7a08e8d33da2 (patch) | |
tree | 9dd2b3d780d270f9d9567806f22e4680c372347c /src/lib/edje/edje_calc.c | |
parent | 7243b71a19500e72780dc684bd7b2094b9bd5050 (diff) |
slider: fix jumping handler bug.
Summary:
Actual slider value is not changed.
So when user release mouse or touch, slider value is returned
to the value by user set.
This is a partial revert of f41e2761608fff7b070d630a738
Fixes T5745
Test Plan: elementary_test -> slider
Reviewers: jpeg
Subscribers: cedric
Maniphest Tasks: T5745
Differential Revision: https://phab.enlightenment.org/D5031
Diffstat (limited to '')
-rw-r--r-- | src/lib/edje/edje_calc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 1bad0321cc..4ec2d0288a 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c | |||
@@ -1075,6 +1075,7 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y) | |||
1075 | Evas_Coord ex = 0, ey = 0; | 1075 | Evas_Coord ex = 0, ey = 0; |
1076 | /* check whether this part is dragable at all */ | 1076 | /* check whether this part is dragable at all */ |
1077 | if (!ep->drag) return; | 1077 | if (!ep->drag) return; |
1078 | if (ep->drag->down.count > 0) return; | ||
1078 | 1079 | ||
1079 | /* instead of checking for equality, we really should check that | 1080 | /* instead of checking for equality, we really should check that |
1080 | * the difference is greater than foo, but I have no idea what | 1081 | * the difference is greater than foo, but I have no idea what |
@@ -1085,8 +1086,6 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y) | |||
1085 | 1086 | ||
1086 | if (NEQ(ep->drag->x, x) || ep->drag->tmp.x) | 1087 | if (NEQ(ep->drag->x, x) || ep->drag->tmp.x) |
1087 | { | 1088 | { |
1088 | if (ep->drag->down.count > 0) | ||
1089 | ep->drag->down.x = ex; | ||
1090 | ep->drag->x = x; | 1089 | ep->drag->x = x; |
1091 | ep->drag->tmp.x = 0; | 1090 | ep->drag->tmp.x = 0; |
1092 | ep->drag->need_reset = 0; | 1091 | ep->drag->need_reset = 0; |
@@ -1096,8 +1095,6 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y) | |||
1096 | 1095 | ||
1097 | if (NEQ(ep->drag->y, y) || ep->drag->tmp.y) | 1096 | if (NEQ(ep->drag->y, y) || ep->drag->tmp.y) |
1098 | { | 1097 | { |
1099 | if (ep->drag->down.count > 0) | ||
1100 | ep->drag->down.y = ey; | ||
1101 | ep->drag->y = y; | 1098 | ep->drag->y = y; |
1102 | ep->drag->tmp.y = 0; | 1099 | ep->drag->tmp.y = 0; |
1103 | ep->drag->need_reset = 0; | 1100 | ep->drag->need_reset = 0; |