woohyun pushed a commit to branch master.
commit 9a7111571a0912e6ac1c095e528fe261d55c0b53
Author: WooHyun Jung <[email protected]>
Date: Mon Mar 11 20:08:52 2013 +0900
elementary/naviframe : Don need to check whether current item has content
or not.
---
src/lib/elc_naviframe.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 537f776..c3e8f05 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -454,7 +454,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
if (evas_object_data_get(VIEW(nit), "out_of_list"))
goto end;
- if (nit->content && !sd->on_deletion)
+ if (!sd->on_deletion)
{
nit->unfocusable = elm_widget_tree_unfocusable_get(VIEW(nit));
elm_widget_tree_unfocusable_set(VIEW(nit), EINA_TRUE);
@@ -1012,8 +1012,7 @@ _on_item_push_finished(void *data,
evas_object_hide(VIEW(it));
- if (it->content)
- elm_widget_tree_unfocusable_set(VIEW(it), it->unfocusable);
+ elm_widget_tree_unfocusable_set(VIEW(it), it->unfocusable);
if (sd->freeze_events)
evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
@@ -1031,7 +1030,7 @@ _on_item_pop_finished(void *data,
ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd);
- if (sd->preserve && it->content)
+ if (sd->preserve)
elm_widget_tree_unfocusable_set(VIEW(it), it->unfocusable);
sd->popping = eina_list_remove(sd->popping, it);
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
