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

elementary/naviframe - modified to use elm_object_item common apis. 

Need to consider about another parts name case. 

It will be hard work to support the case - non-default parts name is passed

How could the widgets cover those cases automatically?



SVN revision: 62098
This commit is contained in:
ChunEon Park 2011-08-04 16:52:39 +00:00
parent 2b4f061b56
commit 09dac68f6e
2 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/elementary/src/lib/Elementary.h.in
View File

@ -24139,12 +24139,6 @@ extern "C" {
EAPI void elm_player_video_set(Evas_Object *player, Evas_Object *video);
/* naviframe */
typedef enum
{
ELM_NAVIFRAME_PREV_BUTTON,
ELM_NAVIFRAME_NEXT_BUTTON
} Elm_Naviframe_Button_Type;
EAPI Evas_Object *elm_naviframe_add(Evas_Object *parent) EINA_ARG_NONNULL(1);
EAPI Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) EINA_ARG_NONNULL(1, 5);
EAPI Evas_Object *elm_naviframe_item_pop(Evas_Object *obj) EINA_ARG_NONNULL(1);
@ -24156,8 +24150,6 @@ extern "C" {
EAPI const char *elm_naviframe_item_subtitle_label_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1);
EAPI Elm_Object_Item *elm_naviframe_top_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI Elm_Object_Item *elm_naviframe_bottom_item_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_naviframe_item_button_set(Elm_Object_Item *it, Evas_Object *btn, Elm_Naviframe_Button_Type btn_type) EINA_ARG_NONNULL(1);
EAPI Evas_Object *elm_naviframe_item_button_get(const Elm_Object_Item *it, Elm_Naviframe_Button_Type btn_type) EINA_ARG_NONNULL(1);
EAPI void elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style) EINA_ARG_NONNULL(1);
EAPI const char *elm_naviframe_item_style_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1);
EAPI void elm_naviframe_item_title_visible_set(Elm_Object_Item *it, Eina_Bool visible) EINA_ARG_NONNULL(1);

69
legacy/elementary/src/lib/elc_naviframe.c
View File

@ -154,6 +154,7 @@ _text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
_item_subtitle_label_set(navi_it, label);
return;
}
WRN("The part name is invalid! : naviframe=%p", navi_it->base.widget);
}
static const char *
@ -170,6 +171,7 @@ _text_get_hook(const Elm_Object_Item *it, const char *part)
{
return navi_it->title_sublabel;
}
WRN("The part name is invalid! : naviframe=%p", navi_it->base.widget);
return NULL;
}
@ -191,8 +193,21 @@ _content_set_hook(Elm_Object_Item *it,
_item_icon_set(navi_it, content);
return;
}
else if(!strcmp(part, "elm.swallow.prev_btn"))
{
_title_prev_btn_set(navi_it, content, EINA_FALSE);
return;
}
else if(!strcmp(part, "elm.swallow.next_btn"))
{
_title_next_btn_set(navi_it, content);
return;
}
WRN("The part name is invalid! : naviframe=%p", navi_it->base.widget);
}
static Evas_Object *
_content_get_hook(const Elm_Object_Item *it,
const char *part)
@ -208,6 +223,16 @@ _content_get_hook(const Elm_Object_Item *it,
{
return navi_it->title_icon;
}
else if(!strcmp(part, "elm.swallow.prev_btn"))
{
return navi_it->title_prev_btn;
}
else if(!strcmp(part, "elm.swallow.next_btn"))
{
return navi_it->title_next_btn;
}
WRN("The part name is invalid! : naviframe=%p", navi_it->base.widget);
return NULL;
}
@ -371,6 +396,8 @@ _title_prev_btn_set(Elm_Naviframe_Item *it, Evas_Object *btn, Eina_Bool back_btn
it);
edje_object_part_swallow(it->title, "elm.swallow.prev_btn", btn);
it->back_btn = back_btn;
_item_sizing_eval(it);
}
static void
@ -398,6 +425,8 @@ _title_next_btn_set(Elm_Naviframe_Item *it, Evas_Object *btn)
_title_next_btn_del,
it);
edje_object_part_swallow(it->title, "elm.swallow.next_btn", btn);
_item_sizing_eval(it);
}
static void
@ -735,46 +764,6 @@ elm_naviframe_bottom_item_get(const Evas_Object *obj)
return NULL;
}
EAPI void
elm_naviframe_item_button_set(Elm_Object_Item *it, Evas_Object *btn, Elm_Naviframe_Button_Type btn_type)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
Elm_Naviframe_Item *navi_it = ELM_CAST(it);
switch(btn_type)
{
case ELM_NAVIFRAME_PREV_BUTTON:
_title_prev_btn_set(navi_it, btn, EINA_FALSE);
break;
case ELM_NAVIFRAME_NEXT_BUTTON:
_title_next_btn_set(navi_it, btn);
break;
default:
WRN("Button type is invalid! : naviframe=%p", navi_it->base.widget);
break;
}
_item_sizing_eval(navi_it);
}
EAPI Evas_Object *
elm_naviframe_item_button_get(const Elm_Object_Item *it, Elm_Naviframe_Button_Type btn_type)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
Elm_Naviframe_Item *navi_it = ELM_CAST(it);
switch(btn_type)
{
case ELM_NAVIFRAME_PREV_BUTTON:
return navi_it->title_prev_btn;
case ELM_NAVIFRAME_NEXT_BUTTON:
return navi_it->title_next_btn;
default:
WRN("Button type is invalid! : naviframe=%p", navi_it->base.widget);
break;
}
return NULL;
}
EAPI void
elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style)
{