kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary/elm_widget - added minor exceptions. 

SVN revision: 57688
This commit is contained in:
ChunEon Park 2011-03-11 11:44:23 +00:00
parent c3e3ebb3ac
commit 7a7a2dd695
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
legacy/elementary/src/lib/elm_widget.c
View File

@ -1589,11 +1589,12 @@ elm_widget_focus_steal(Evas_Object *obj)
{
parent = elm_widget_parent_get(parent);
sd = evas_object_smart_data_get(parent);
if (elm_widget_focus_get(sd->resize_obj))
if (sd->resize_obj)
{
elm_widget_focused_object_clear(sd->resize_obj);
if (elm_widget_focus_get(sd->resize_obj))
elm_widget_focused_object_clear(sd->resize_obj);
}
else
else
{
const Eina_List *l;
Evas_Object *child;
@ -2537,7 +2538,11 @@ _newest_focus_order_get(Evas_Object *obj, unsigned int *newest_focus_order, Eina
if (!ret) continue;
best = ret;
}
if ((can_focus_only) && (!elm_widget_can_focus_get(best))) return NULL;
if (can_focus_only)
{
if ((!best) || (!elm_widget_can_focus_get(best)))
return NULL;
}
return best;
}