summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehwan Kim <jae.hwan.kim@samsung.com>2013-04-23 17:01:25 +0900
committerJaehwan Kim <jae.hwan.kim@samsung.com>2013-04-23 17:03:03 +0900
commit33e01102107bb7a4ae2934208912f3512fbc294e (patch)
treee780893e153c2592623fcc28b0517252919e5462
parent1434359092410b1d4822185ba802dab1807eddf8 (diff)
downloadelementary-33e01102107bb7a4ae2934208912f3512fbc294e.tar.gz
Fix the scrolled entry in scroller is located wrong position when the cursor is changed.
It is a scroller in scroller. In this case, it moved twice.
-rw-r--r--ChangeLog5
-rw-r--r--NEWS1
-rw-r--r--src/lib/elm_widget.c12
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 68abc32d1..01233d33b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1276,3 +1276,8 @@
2013-04-23 ChunEon Park
* Added elm_object_domain_part_text_translatable_set().
+
+2013-04-23 Jaehwan Kim
+
+ * Fix the scrolled entry in scroller is located wrong position when the cursor is changed.
+ It is a scroller in scroller. In this case, it moved twice.
diff --git a/NEWS b/NEWS
index d76c98230..a2e8bee1b 100644
--- a/NEWS
+++ b/NEWS
@@ -213,6 +213,7 @@ Fixes:
* Fix the policy is not changed when the theme is changed.
* When entry is disabled, scrolling is also disabled.
* Make access object unfocusable when Aaccessibility is disabled.
+ * Fix the scrolled entry in scroller is located wrong position when the cursor is changed.
Removals:
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 2686801de..5ca6b9903 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -3320,7 +3320,7 @@ _elm_widget_show_region_set(Eo *obj, void *_pd, va_list *list)
Eina_Bool forceshow = va_arg(*list, int);
Evas_Object *parent_obj, *child_obj;
- Evas_Coord px, py, cx, cy;
+ Evas_Coord px, py, cx, cy, nx, ny;
Elm_Widget_Smart_Data *sd = _pd;
@@ -3334,8 +3334,14 @@ _elm_widget_show_region_set(Eo *obj, void *_pd, va_list *list)
sd->rw = w;
sd->rh = h;
if (sd->on_show_region)
- sd->on_show_region
- (sd->on_show_region_data, obj);
+ {
+ sd->on_show_region
+ (sd->on_show_region_data, obj);
+
+ eo_do(obj, elm_scrollable_interface_content_pos_get(&nx, &ny));
+ x -= nx;
+ y -= ny;
+ }
do
{