From 5611343e2a2cb501f1096c36fab609b9074a6453 Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Mon, 30 May 2011 10:43:22 +0900 Subject: [PATCH] elm_widget : merge with upstream 59731 (forcus problem) Change-Id: Id9cc8fe79347d9755b228c61ab36f3e08f3bcf62 --- src/lib/elm_widget.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index f5b3a2d..642ed7b 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -312,23 +312,12 @@ static void _parent_focus(Evas_Object *obj) { API_ENTRY return; + if (sd->focused) return; Evas_Object *o = elm_widget_parent_get(obj); sd->focus_order_on_calc = EINA_TRUE; - if (sd->focused) return; - if (o) - { - unsigned int i = 0; - Evas_Object *ret; - - ret = _newest_focus_order_get(o, &i, EINA_TRUE); - - /* we don't want to bump a common widget ancestor's - focus_order *twice* while parent focusing */ - if (!ret || (!i) || (i != focus_order)) - _parent_focus(o); - } + if (o) _parent_focus(o); if (!sd->focus_order_on_calc) return; /* we don't want to override it if by means of any of the -- 2.7.4