summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaeun Choi <jaeun12.choi@samsung.com>2014-06-25 13:49:44 +0900
committerJaeun Choi <jaeun12.choi@samsung.com>2014-06-25 13:49:44 +0900
commitda1b5c8fecff8a3acb86a2be7184c3021bf47584 (patch)
tree38652473f9c6fc53677a013cd693926ad9e93db3
parentb03197a88b09c30ab75fc8311d5f4314c0539370 (diff)
downloadelementary-da1b5c8fecff8a3acb86a2be7184c3021bf47584.tar.gz
Revert "bug fix: _elm_widget_focus_region_show"
This reverts commit 1574f59fd88c53b380ab83317106164ae1c84652. This breaks focus move in scroller
-rw-r--r--src/lib/elm_widget.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 6d24f0a15..283041a7b 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -648,12 +648,6 @@ _elm_widget_focus_region_show(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
if (_elm_scrollable_is(o) && !elm_widget_disabled_get(o))
{
- if (!elm_widget_focus_region_get(o, &x, &y, &w, &h))
- {
- o = elm_widget_parent_get(o);
- continue;
- }
-
switch (_elm_config->focus_autoscroll_mode)
{
case ELM_FOCUS_AUTOSCROLL_MODE_SHOW:
@@ -665,6 +659,13 @@ _elm_widget_focus_region_show(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
default:
break;
}
+
+
+ if (!elm_widget_focus_region_get(o, &x, &y, &w, &h))
+ {
+ o = elm_widget_parent_get(o);
+ continue;
+ }
}
else
{