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)
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)
648 648
649 if (_elm_scrollable_is(o) && !elm_widget_disabled_get(o)) 649 if (_elm_scrollable_is(o) && !elm_widget_disabled_get(o))
650 { 650 {
651 if (!elm_widget_focus_region_get(o, &x, &y, &w, &h))
652 {
653 o = elm_widget_parent_get(o);
654 continue;
655 }
656
657 switch (_elm_config->focus_autoscroll_mode) 651 switch (_elm_config->focus_autoscroll_mode)
658 { 652 {
659 case ELM_FOCUS_AUTOSCROLL_MODE_SHOW: 653 case ELM_FOCUS_AUTOSCROLL_MODE_SHOW:
@@ -665,6 +659,13 @@ _elm_widget_focus_region_show(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
665 default: 659 default:
666 break; 660 break;
667 } 661 }
662
663
664 if (!elm_widget_focus_region_get(o, &x, &y, &w, &h))
665 {
666 o = elm_widget_parent_get(o);
667 continue;
668 }
668 } 669 }
669 else 670 else
670 { 671 {