{
EINA_INLIST;
const char *part;
+ Evas_Object *content;
Elm_Naviframe_Item *it;
};
{
EINA_INLIST;
const char *part;
+ const char *text;
};
struct _Elm_Naviframe_Item
const char *emission,
const char *source);
static void _disable_hook(Evas_Object *obj);
+static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
static void _item_text_set_hook(Elm_Object_Item *it,
const char *part,
const char *label);
Evas_Object *next_btn,
Evas_Object *content,
const char *item_style);
-static Eina_Bool _focus_next_hook(const Evas_Object *obj,
- Elm_Focus_Direction dir,
- Evas_Object **next);
static void
_del_hook(Evas_Object *obj)
_item_style_set(it, it->style);
_item_title_visible_update(it);
}
+
+ _elm_widget_mirrored_reload(obj);
+ _mirrored_set(obj, elm_widget_mirrored_get(obj));
}
static void _emit_hook(Evas_Object *obj,
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
- elm_object_signal_emit(wd->base, emission, source);
+ edje_object_signal_emit(wd->base, emission, source);
}
static void
}
static void
+_mirrored_set(Evas_Object *obj, Eina_Bool rtl)
+{
+ Widget_Data *wd;
+ Elm_Naviframe_Item *it;
+
+ wd = elm_widget_data_get(obj);
+ if (!wd) return;
+
+ EINA_INLIST_FOREACH(wd->stack, it)
+ edje_object_mirrored_set(VIEW(it), rtl);
+ edje_object_mirrored_set(wd->base, rtl);
+}
+
+static void
_item_text_set_hook(Elm_Object_Item *it,
const char *part,
const char *label)
navi_it->text_list = eina_inlist_append(navi_it->text_list,
EINA_INLIST_GET(pair));
}
- elm_object_part_text_set(VIEW(navi_it), buf, label);
+
+ eina_stringshare_replace(&pair->text, label);
+ edje_object_part_text_set(VIEW(navi_it), buf, label);
if (label)
{
snprintf(buf, sizeof(buf), "elm,state,%s,show", buf);
- elm_object_signal_emit(VIEW(navi_it), buf, "elm");
+ edje_object_signal_emit(VIEW(navi_it), buf, "elm");
}
else
{
snprintf(buf, sizeof(buf), "elm,state,%s,hide", buf);
- elm_object_signal_emit(VIEW(navi_it), buf, "elm");
+ edje_object_signal_emit(VIEW(navi_it), buf, "elm");
}
_sizing_eval(WIDGET(navi_it));
_item_text_get_hook(const Elm_Object_Item *it, const char *part)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ Elm_Naviframe_Text_Item_Pair *pair = NULL;
+ Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
char buf[1024];
if (!part || !strcmp(part, "default"))
else
snprintf(buf, sizeof(buf), "%s", part);
- return elm_object_part_text_get(VIEW(it), buf);
+ EINA_INLIST_FOREACH(navi_it->text_list, pair)
+ {
+ if (!strcmp(buf, pair->part))
+ return pair->text;
+ }
+ return NULL;
}
static void
_item_content_get_hook(const Elm_Object_Item *it, const char *part)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+ Elm_Naviframe_Content_Item_Pair *pair = NULL;
Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
//specified parts
return navi_it->title_icon;
//common parts
- return elm_object_part_content_get(VIEW(navi_it), part);
+ EINA_INLIST_FOREACH(navi_it->content_list, pair)
+ {
+ if (!strcmp(part, pair->part))
+ return pair->content;
+ }
+ return NULL;
}
static Evas_Object *
const char *source)
{
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
- elm_object_signal_emit(VIEW(it), emission, source);
+ Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
+ edje_object_signal_emit(VIEW(navi_it), emission, source);
}
static void
_item_title_visible_update(Elm_Naviframe_Item *navi_it)
{
if (navi_it->title_visible)
- elm_object_signal_emit(VIEW(navi_it), "elm,state,title,show", "elm");
+ edje_object_signal_emit(VIEW(navi_it), "elm,state,title,show", "elm");
else
- elm_object_signal_emit(VIEW(navi_it), "elm,state,title,hide", "elm");
+ edje_object_signal_emit(VIEW(navi_it), "elm,state,title,hide", "elm");
}
static void
{
evas_object_move(VIEW(it), x, y);
evas_object_resize(VIEW(it), w, h);
- edje_object_size_min_calc(elm_layout_edje_get(VIEW(it)),
- &it->minw,
- &it->minh);
+ edje_object_size_min_calc(VIEW(it), &it->minw, &it->minh);
if (it->minw > minw) minw = it->minw;
if (it->minh > minh) minh = it->minh;
}
Elm_Naviframe_Content_Item_Pair *pair = data;
Elm_Naviframe_Item *it = pair->it;
snprintf(buf, sizeof(buf), "elm,state,%s,hide", pair->part);
- elm_object_signal_emit(VIEW(it), buf, "elm");
+ edje_object_signal_emit(VIEW(it), buf, "elm");
it->content_list = eina_inlist_remove(it->content_list,
EINA_INLIST_GET(pair));
eina_stringshare_del(pair->part);
Elm_Naviframe_Item *it = data;
it->back_btn = EINA_FALSE;
it->title_prev_btn = NULL;
- elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
}
static void
{
Elm_Naviframe_Item *it = data;
it->title_next_btn = NULL;
- elm_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
}
static void
{
Elm_Naviframe_Item *it = data;
it->title_icon = NULL;
- elm_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
}
static void
{
Elm_Naviframe_Item *it = data;
it->content = NULL;
- elm_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
}
static void
{
char buf[1024];
Elm_Naviframe_Content_Item_Pair *pair = NULL;
- Evas_Object *prev_content = NULL;
EINA_INLIST_FOREACH(it->content_list, pair)
if (!strcmp(part, pair->part)) break;
if (pair)
{
- prev_content = elm_object_part_content_get(VIEW(it), part);
- if (prev_content != content)
+ if (pair->content != content)
{
if (content)
{
- evas_object_event_callback_del(prev_content,
+ evas_object_event_callback_del(pair->content,
EVAS_CALLBACK_DEL,
_title_content_del);
+ evas_object_event_callback_del(pair->content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints);
snprintf(buf, sizeof(buf), "elm,state,%s,hide", part);
- elm_object_signal_emit(VIEW(it), buf, "elm");
+ edje_object_signal_emit(VIEW(it), buf, "elm");
}
- evas_object_del(prev_content);
+ evas_object_del(pair->content);
if (!content) return;
}
}
it->content_list = eina_inlist_append(it->content_list,
EINA_INLIST_GET(pair));
}
- if (prev_content != content)
+ if (pair->content != content)
{
+ elm_widget_sub_object_add(WIDGET(it), content);
evas_object_event_callback_add(content,
EVAS_CALLBACK_DEL,
_title_content_del,
pair);
+ evas_object_event_callback_add(content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints,
+ WIDGET(it));
}
- elm_object_part_content_set(VIEW(it), part, content);
+ edje_object_part_swallow(VIEW(it), part, content);
snprintf(buf, sizeof(buf), "elm,state,%s,show", part);
- elm_object_signal_emit(VIEW(it), buf, "elm");
+ edje_object_signal_emit(VIEW(it), buf, "elm");
+ pair->content = content;
_sizing_eval(WIDGET(it));
}
Eina_Bool back_btn)
{
if (it->title_prev_btn == btn) return;
- if (it->title_prev_btn) evas_object_del(it->title_prev_btn);
+
+ if (it->title_prev_btn)
+ evas_object_del(it->title_prev_btn);
+
it->title_prev_btn = btn;
if (!btn) return;
+ elm_widget_sub_object_add(WIDGET(it), btn);
evas_object_event_callback_add(btn,
EVAS_CALLBACK_DEL,
_title_prev_btn_del,
it);
- elm_object_part_content_set(VIEW(it), "elm.swallow.prev_btn", btn);
- elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,show", "elm");
+ evas_object_event_callback_add(btn,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints,
+ WIDGET(it));
+ edje_object_part_swallow(VIEW(it), "elm.swallow.prev_btn", btn);
+ edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,show", "elm");
it->back_btn = back_btn;
_sizing_eval(WIDGET(it));
_title_next_btn_set(Elm_Naviframe_Item *it, Evas_Object *btn)
{
if (it->title_next_btn == btn) return;
- if (it->title_next_btn) evas_object_del(it->title_next_btn);
+
+ if (it->title_next_btn)
+ evas_object_del(it->title_next_btn);
+
it->title_next_btn = btn;
if (!btn) return;
+ elm_widget_sub_object_add(WIDGET(it), btn);
evas_object_event_callback_add(btn,
EVAS_CALLBACK_DEL,
_title_next_btn_del,
it);
- elm_object_part_content_set(VIEW(it), "elm.swallow.next_btn", btn);
- elm_object_signal_emit(VIEW(it), "elm,state,next_btn,show", "elm");
+ evas_object_event_callback_add(btn,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints,
+ WIDGET(it));
+ edje_object_part_swallow(VIEW(it), "elm.swallow.next_btn", btn);
+ edje_object_signal_emit(VIEW(it), "elm,state,next_btn,show", "elm");
_sizing_eval(WIDGET(it));
}
_title_icon_set(Elm_Naviframe_Item *it, Evas_Object *icon)
{
if (it->title_icon == icon) return;
- if (it->title_icon) evas_object_del(it->title_icon);
+
+ if (it->title_icon)
+ evas_object_del(it->title_icon);
+
it->title_icon = icon;
if (!icon) return;
+ elm_widget_sub_object_add(WIDGET(it), icon);
evas_object_event_callback_add(icon,
EVAS_CALLBACK_DEL,
_title_icon_del,
it);
- elm_object_part_content_set(VIEW(it), "elm.swallow.icon", icon);
- elm_object_signal_emit(VIEW(it), "elm,state,icon,show", "elm");
+ evas_object_event_callback_add(icon,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints,
+ WIDGET(it));
+ edje_object_part_swallow(VIEW(it), "elm.swallow.icon", icon);
+ edje_object_signal_emit(VIEW(it), "elm,state,icon,show", "elm");
_sizing_eval(WIDGET(it));
}
Evas_Object *content = it->content;
if (!content) return NULL;
- elm_object_part_content_unset(VIEW(it), "elm.swallow.content");
- elm_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
+ elm_widget_sub_object_del(WIDGET(it), content);
+ edje_object_part_unswallow(VIEW(it), content);
+ edje_object_signal_emit(VIEW(it), "elm,state,content,hide", "elm");
evas_object_event_callback_del(content,
EVAS_CALLBACK_DEL,
_item_content_del);
+ evas_object_event_callback_del(content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints);
_sizing_eval(WIDGET(it));
it->content = NULL;
Evas_Object *content = it->title_prev_btn;
if (!content) return NULL;
- elm_object_part_content_unset(VIEW(it), "elm.swallow.prev_btn");
- elm_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
+ elm_widget_sub_object_del(WIDGET(it), content);
+ edje_object_part_unswallow(VIEW(it), content);
+ edje_object_signal_emit(VIEW(it), "elm,state,prev_btn,hide", "elm");
evas_object_event_callback_del(content,
EVAS_CALLBACK_DEL,
_title_prev_btn_del);
+ evas_object_event_callback_del(content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints);
_sizing_eval(WIDGET(it));
it->title_prev_btn = NULL;
Evas_Object *content = it->title_next_btn;
if (!content) return NULL;
- elm_object_part_content_unset(VIEW(it), "elm.swallow.next_btn");
- elm_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
+ elm_widget_sub_object_del(WIDGET(it), content);
+ edje_object_part_unswallow(VIEW(it), content);
+ edje_object_signal_emit(VIEW(it), "elm,state,next_btn,hide", "elm");
evas_object_event_callback_del(content,
EVAS_CALLBACK_DEL,
_title_next_btn_del);
+ evas_object_event_callback_del(content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints);
_sizing_eval(WIDGET(it));
it->title_next_btn = NULL;
Evas_Object *content = it->title_icon;
if (!content) return NULL;
- elm_object_part_content_unset(VIEW(it), "elm.swallow.icon");
- elm_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
+ elm_widget_sub_object_del(WIDGET(it), content);
+ edje_object_part_unswallow(VIEW(it), content);
+ edje_object_signal_emit(VIEW(it), "elm,state,icon,hide", "elm");
evas_object_event_callback_del(content,
EVAS_CALLBACK_DEL,
_title_icon_del);
+ evas_object_event_callback_del(content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints);
_sizing_eval(WIDGET(it));
it->title_icon = NULL;
{
if (!strcmp(part, pair->part))
{
- content = elm_object_part_content_get(VIEW(it), part);
+ content = pair->content;
eina_stringshare_del(pair->part);
it->content_list = eina_inlist_remove(it->content_list,
EINA_INLIST_GET(pair));
if (!content) return NULL;
- elm_object_part_content_unset(VIEW(it), part);
+ elm_widget_sub_object_del(WIDGET(it), content);
+ edje_object_part_unswallow(VIEW(it), content);
snprintf(buf, sizeof(buf), "elm,state,%s,hide", part);
- elm_object_signal_emit(VIEW(it), buf, "elm");
+ edje_object_signal_emit(VIEW(it), buf, "elm");
evas_object_event_callback_del(content,
EVAS_CALLBACK_DEL,
_title_content_del);
+ evas_object_event_callback_del(content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints);
_sizing_eval(WIDGET(it));
return content;
Widget_Data *wd;
Elm_Naviframe_Content_Item_Pair *content_pair;
Elm_Naviframe_Text_Item_Pair *text_pair;
- Evas_Object *content;
if (!it) return;
wd = elm_widget_data_get(WIDGET(it));
if (!wd) return;
+ if (it->title_prev_btn)
+ evas_object_del(it->title_prev_btn);
+ if (it->title_next_btn)
+ evas_object_del(it->title_next_btn);
+ if (it->title_icon)
+ evas_object_del(it->title_icon);
+ if ((it->content) && (!wd->preserve))
+ evas_object_del(it->content);
+
while (it->content_list)
{
- content_pair =
- EINA_INLIST_CONTAINER_GET(it->content_list,
- Elm_Naviframe_Content_Item_Pair);
- content = elm_object_part_content_get(VIEW(it), content_pair->part);
- evas_object_event_callback_del(content,
+ content_pair = EINA_INLIST_CONTAINER_GET(it->content_list,
+ Elm_Naviframe_Content_Item_Pair);
+ evas_object_event_callback_del(content_pair->content,
EVAS_CALLBACK_DEL,
_title_content_del);
+ evas_object_event_callback_del(content_pair->content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints);
+ evas_object_del(content_pair->content);
eina_stringshare_del(content_pair->part);
it->content_list = eina_inlist_remove(it->content_list,
it->content_list);
text_pair = EINA_INLIST_CONTAINER_GET(it->text_list,
Elm_Naviframe_Text_Item_Pair);
eina_stringshare_del(text_pair->part);
+ eina_stringshare_del(text_pair->text);
it->text_list = eina_inlist_remove(it->text_list,
it->text_list);
free(text_pair);
{
if (navi_it->content == content) return;
if (navi_it->content) evas_object_del(navi_it->content);
- elm_object_part_content_set(VIEW(navi_it), "elm.swallow.content", content);
-
+ elm_widget_sub_object_add(WIDGET(navi_it), content);
+ edje_object_part_swallow(VIEW(navi_it),
+ "elm.swallow.content",
+ content);
if (content)
- elm_object_signal_emit(VIEW(navi_it), "elm,state,content,show", "elm");
+ edje_object_signal_emit(VIEW(navi_it),
+ "elm,state,content,show",
+ "elm");
else
- elm_object_signal_emit(VIEW(navi_it), "elm,state,content,hide", "elm");
-
+ edje_object_signal_emit(VIEW(navi_it),
+ "elm,state,content,hide",
+ "elm");
evas_object_event_callback_add(content,
EVAS_CALLBACK_DEL,
_item_content_del,
navi_it);
+ evas_object_event_callback_add(content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints,
+ WIDGET(navi_it));
navi_it->content = content;
_sizing_eval(WIDGET(navi_it));
}
snprintf(buf, sizeof(buf), "item/%s", item_style);
eina_stringshare_replace(&navi_it->style, item_style);
}
- elm_layout_theme_set(VIEW(navi_it),
- "naviframe",
- buf,
- elm_widget_style_get(WIDGET(navi_it)));
+ _elm_theme_object_set(WIDGET(navi_it),
+ VIEW(navi_it),
+ "naviframe",
+ buf,
+ elm_widget_style_get(WIDGET(navi_it)));
//recover item
EINA_INLIST_FOREACH(navi_it->text_list, text_pair)
- _item_text_set_hook((Elm_Object_Item *) navi_it,
- text_pair->part,
- elm_object_part_text_get(VIEW(navi_it),
- text_pair->part));
+ _item_text_set_hook((Elm_Object_Item *) navi_it,
+ text_pair->part,
+ text_pair->text);
EINA_INLIST_FOREACH(navi_it->content_list, content_pair)
- _item_content_set_hook((Elm_Object_Item *) navi_it,
- content_pair->part,
- elm_object_part_content_get(VIEW(navi_it),
- content_pair->part));
+ _item_content_set_hook((Elm_Object_Item *) navi_it,
+ content_pair->part,
+ content_pair->content);
//content
if (navi_it->content)
- elm_object_signal_emit(VIEW(navi_it), "elm,state,content,show", "elm");
+ {
+ edje_object_part_swallow(VIEW(navi_it),
+ "elm.swallow.content",
+ navi_it->content);
+ edje_object_signal_emit(VIEW(navi_it),
+ "elm,state,content,show",
+ "elm");
+ }
//prev button
if (navi_it->title_prev_btn)
- elm_object_signal_emit(VIEW(navi_it), "elm,state,prev_btn,show", "elm");
+ {
+ edje_object_part_swallow(VIEW(navi_it),
+ "elm.swallow.prev_btn",
+ navi_it->title_prev_btn);
+ edje_object_signal_emit(VIEW(navi_it),
+ "elm,state,prev_btn,show",
+ "elm");
+ }
//next button
if (navi_it->title_next_btn)
- elm_object_signal_emit(VIEW(navi_it), "elm,state,next_btn,show", "elm");
+ {
+ edje_object_part_swallow(VIEW(navi_it),
+ "elm.swallow.next_btn",
+ navi_it->title_next_btn);
+ edje_object_signal_emit(VIEW(navi_it),
+ "elm,state,next_btn,show",
+ "elm");
+ }
navi_it->title_visible = EINA_TRUE;
_sizing_eval(WIDGET(navi_it));
elm_widget_item_signal_emit_hook_set(it, _item_signal_emit_hook);
//item base layout
- VIEW(it) = elm_layout_add(obj);
+ VIEW(it) = edje_object_add(evas_object_evas_get(obj));
+ edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(obj));
evas_object_smart_member_add(VIEW(it), wd->base);
-
- evas_object_event_callback_add(VIEW(it),
- EVAS_CALLBACK_CHANGED_SIZE_HINTS,
- _changed_size_hints,
- obj);
- elm_object_signal_callback_add(VIEW(it),
+ elm_widget_sub_object_add(obj, VIEW(it));
+ edje_object_signal_callback_add(VIEW(it),
"elm,action,show,finished",
"",
_show_finished, it);
- elm_object_signal_callback_add(VIEW(it),
+ edje_object_signal_callback_add(VIEW(it),
"elm,action,pushed,finished",
"",
_pushed_finished, it);
- elm_object_signal_callback_add(VIEW(it),
+ edje_object_signal_callback_add(VIEW(it),
"elm,action,popped,finished",
"",
_popped_finished, it);
- elm_object_signal_callback_add(VIEW(it),
+ edje_object_signal_callback_add(VIEW(it),
"elm,action,title,clicked",
"",
_title_clicked, it);
return it;
}
-static Eina_Bool
-_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
-{
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd || !wd->stack) return EINA_FALSE;
- return elm_widget_focus_next_get(VIEW(elm_naviframe_top_item_get(obj)),
- dir,
- next);
-}
-
EAPI Evas_Object *
elm_naviframe_add(Evas_Object *parent)
{
elm_widget_disable_hook_set(obj, _disable_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_signal_emit_hook_set(obj, _emit_hook);
- elm_widget_can_focus_set(obj, EINA_FALSE);
- elm_widget_focus_next_hook_set(obj, _focus_next_hook);
//base
- wd->base = elm_layout_add(parent);
- evas_object_event_callback_add(wd->base,
- EVAS_CALLBACK_CHANGED_SIZE_HINTS,
- _changed_size_hints,
- obj);
+ wd->base = edje_object_add(e);
+ edje_object_mirrored_set(wd->base, elm_widget_mirrored_get(obj));
elm_widget_resize_object_set(obj, wd->base);
- elm_layout_theme_set(wd->base, "naviframe", "base", "default");
+ _elm_theme_object_set(obj, wd->base, "naviframe", "base", "default");
evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, obj);
evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, obj);
evas_object_freeze_events_set(VIEW(it), EINA_TRUE);
evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE);
}
- elm_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed", "elm");
- elm_object_signal_emit(VIEW(it), "elm,state,new,pushed", "elm");
- edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
- edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
+ edje_object_signal_emit(VIEW(prev_it),
+ "elm,state,cur,pushed",
+ "elm");
+ edje_object_signal_emit(VIEW(it),
+ "elm,state,new,pushed",
+ "elm");
+ edje_object_message_signal_process(VIEW(prev_it));
+ edje_object_message_signal_process(VIEW(it));
}
wd->stack = eina_inlist_append(wd->stack, EINA_INLIST_GET(it));
_sizing_eval(obj);
evas_object_freeze_events_set(VIEW(it), EINA_TRUE);
evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE);
}
- elm_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm");
+ edje_object_signal_emit(VIEW(it), "elm,state,cur,popped", "elm");
evas_object_show(VIEW(prev_it));
evas_object_raise(VIEW(prev_it));
- elm_object_signal_emit(VIEW(prev_it),
- "elm,state,prev,popped",
- "elm");
- edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
- edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
+ edje_object_signal_emit(VIEW(prev_it),
+ "elm,state,prev,popped",
+ "elm");
+ edje_object_message_signal_process(VIEW(it));
+ edje_object_message_signal_process(VIEW(prev_it));
}
else
_item_del(it);
evas_object_freeze_events_set(VIEW(it), EINA_TRUE);
evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE);
}
- elm_object_signal_emit(VIEW(prev_it),
- "elm,state,cur,pushed",
- "elm");
+ edje_object_signal_emit(VIEW(prev_it),
+ "elm,state,cur,pushed",
+ "elm");
evas_object_show(VIEW(navi_it));
evas_object_raise(VIEW(navi_it));
- elm_object_signal_emit(VIEW(navi_it),
- "elm,state,new,pushed",
- "elm");
- edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
- edje_object_message_signal_process(elm_layout_edje_get(VIEW(navi_it)));
+ edje_object_signal_emit(VIEW(navi_it),
+ "elm,state,new,pushed",
+ "elm");
+ edje_object_message_signal_process(VIEW(prev_it));
+ edje_object_message_signal_process(VIEW(navi_it));
}
EAPI void
Elm_Naviframe_Item);
evas_object_show(VIEW(navi_it));
evas_object_raise(VIEW(navi_it));
- elm_object_signal_emit(VIEW(navi_it), "elm,state,visible", "elm");
+ edje_object_signal_emit(VIEW(navi_it), "elm,state,visible", "elm");
}
else
{
Ecore_Idle_Enterer *queue_idle_enterer;
Ecore_Idler *must_recalc_idler;
Eina_List *queue, *selected;
- Elm_Genlist_Item *show_item, *last_selected_item, *anchor_item, *mode_item, *reorder_it, *reorder_rel, *expand_item;
+ Elm_Genlist_Item *show_item, *last_selected_item, *anchor_item, *mode_item, *reorder_it, *reorder_rel, *expanded_item;
Eina_Inlist *item_cache;
Evas_Coord anchor_y, reorder_start_y;
Elm_List_Mode mode;
int in,
Eina_Bool calc)
{
- Elm_Genlist_Item *it2;
const char *stacking;
const char *treesize;
char buf[1024];
- int depth, tsize = 20;
+ int tsize = 20;
Item_Cache *itc = NULL;
if ((it->realized) || (it->delete_me)) return;
evas_object_color_set(it->spacer, 0, 0, 0, 0);
elm_widget_sub_object_add(WIDGET(it), it->spacer);
}
- for (it2 = it, depth = 0; it2->parent; it2 = it2->parent)
- {
- if (it2->parent->flags != ELM_GENLIST_ITEM_GROUP) depth += 1;
- }
- it->expanded_depth = depth;
+
treesize = edje_object_data_get(VIEW(it), "treesize");
if (treesize) tsize = atoi(treesize);
evas_object_size_hint_min_set(it->spacer,
- (depth * tsize) * _elm_config->scale, 1);
+ (it->expanded_depth * tsize) * _elm_config->scale, 1);
edje_object_part_swallow(VIEW(it), "elm.swallow.pad", it->spacer);
if (!calc)
{
}
}
if (!it->move_effect_enabled)
- if (!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE) && it->parent == it->wd->expand_item))
+ if (!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE) && it->parent == it->wd->expanded_item))
{
if (it->wd->edit_mode && it->itc->edit_item_style)
{
}
}
in++;
- if (!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE) && it->parent == it->wd->expand_item))
+ if (!it->wd->effect_mode || it->wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_NONE || ((it->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE) && it->parent == it->wd->expanded_item))
{
it->old_scrl_y = it->scrl_y;
}
edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
if (!it->display_only)
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+ if (mw > itb->w)
+ width_changed = EINA_TRUE;
+ else
+ mw = itb->w;
it->w = it->minw = mw;
it->h = it->minh = mh;
it->mincalcd = EINA_TRUE;
if (!sd->wd->item_moving_effect_timer)
{
if (sd->wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE)
- _item_flip_effect_show(sd->wd->expand_item);
+ _item_flip_effect_show(sd->wd->expanded_item);
evas_object_raise(sd->wd->alpha_bg);
evas_object_show(sd->wd->alpha_bg);
Evas_Smart_Cb func,
const void *func_data)
{
- Elm_Genlist_Item *it;
+ Elm_Genlist_Item *it, *it2;
+ int depth = 0;
it = elm_widget_item_new(wd->obj, Elm_Genlist_Item);
if (!it) return NULL;
else if (it->parent->group_item)
it->group_item = it->parent->group_item;
}
+ for (it2 = it, depth = 0; it2->parent; it2 = it2->parent)
+ {
+ if (it2->parent->flags != ELM_GENLIST_ITEM_GROUP) depth += 1;
+ }
+ it->expanded_depth = depth;
return it;
}
if ((!wd->item_moving_effect_timer) && (it->flags != ELM_GENLIST_ITEM_GROUP) &&
wd->move_effect_mode != ELM_GENLIST_ITEM_MOVE_EFFECT_DELETE)
{
- wd->expand_item = it;
+ wd->expanded_item = it;
_item_flip_effect_show(it);
evas_object_geometry_get(VIEW(it), NULL, &y, NULL, &h);
wd->expand_item_end = y + h;
if (it->flags != ELM_GENLIST_ITEM_SUBITEMS) return;
if (it->expanded == expanded) return;
it->expanded = expanded;
- it->wd->expand_item = it;
+ it->wd->expanded_item = it;
if (it->wd->effect_mode && !it->wd->alpha_bg)
it->wd->alpha_bg = _create_tray_alpha_bg(WIDGET(it));
it->wd->move_effect_mode = ELM_GENLIST_ITEM_MOVE_EFFECT_EXPAND;
if (it->realized)
edje_object_signal_emit(VIEW(it), "elm,state,expanded", "elm");
- evas_object_smart_callback_call(WIDGET(it), "expanded", it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_EXPANDED, it);
}
else
{
it->wd->move_effect_mode = ELM_GENLIST_ITEM_MOVE_EFFECT_CONTRACT;
if (it->realized)
edje_object_signal_emit(VIEW(it), "elm,state,contracted", "elm");
- evas_object_smart_callback_call(WIDGET(it), "contracted", it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACTED, it);
}
}
}
EAPI const char *
+elm_genlist_mode_item_style_get(const Evas_Object *obj)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ return wd->mode_item->itc->mode_item_style;
+}
+
+EAPI void
+elm_genlist_mode_item_style_set(Evas_Object *obj, const char *style)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if ((style == wd->mode_item->itc->mode_item_style) ||
+ (style && wd->mode_item->itc->mode_item_style &&
+ (!strcmp(style, wd->mode_item->itc->mode_item_style))))
+ return;
+ eina_stringshare_replace(&wd->mode_item->itc->mode_item_style, style);
+ elm_genlist_realized_items_update(obj);
+}
+
+EAPI const char *
elm_genlist_mode_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
if (t > time) end = EINA_TRUE;
// Below while statement is needed, when the genlist is resized.
- it2 = wd->expand_item;
+ it2 = wd->expanded_item;
while (it2 && vis)
{
evas_object_move(VIEW(it2), it2->scrl_x, it2->scrl_y);
cvx, cvy, cvw, cvh));
it2 = elm_genlist_item_prev_get(it2);
}
- it2 = elm_genlist_item_next_get(wd->expand_item);
+ it2 = elm_genlist_item_next_get(wd->expanded_item);
while (it2)
{
- if (wd->expand_item->expanded_depth >= it2->expanded_depth) break;
+ if (wd->expanded_item->expanded_depth >= it2->expanded_depth) break;
it2 = elm_genlist_item_next_get(it2);
}
dy = 0;
{
int expand_num = 0;
int expand_order = 0;
- if (wd->expand_item) it = elm_genlist_item_next_get(wd->expand_item);
+ if (wd->expanded_item) it = elm_genlist_item_next_get(wd->expanded_item);
while (it)
{
expand_num++;
it = elm_genlist_item_next_get(it);
}
- if (wd->expand_item) it = elm_genlist_item_next_get(wd->expand_item);
+ if (wd->expanded_item) it = elm_genlist_item_next_get(wd->expanded_item);
while (it)
{
expand_order++;
- if (wd->expand_item->expanded_depth >= it->expanded_depth) break;
+ if (wd->expanded_item->expanded_depth >= it->expanded_depth) break;
if (wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_EXPAND)
{
if (!it->effect_done)
if (wd->item_moving_effect_timer)
{
if (wd->move_effect_mode == ELM_GENLIST_ITEM_MOVE_EFFECT_CONTRACT)
- _item_subitems_clear(wd->expand_item);
+ _item_subitems_clear(wd->expanded_item);
EINA_INLIST_FOREACH(wd->blocks, itb)
{
EINA_LIST_FOREACH(itb->items, l, it)
#include <Elementary.h>
#include "elm_module_priv.h"
#include "elm_priv.h"
+#include <appsvc/appsvc.h>
+
+#define MULTI_(id) dgettext("sys_string", #id)
+#define S_SELECT MULTI_(IDS_COM_SK_SELECT)
+#define S_SELECT_ALL MULTI_(IDS_COM_BODY_SELECT_ALL)
+#define S_COPY MULTI_(IDS_COM_BODY_COPY)
+#define S_CUT MULTI_(IDS_COM_BODY_CUT)
+#define S_PASTE MULTI_(IDS_COM_BODY_PASTE)
+#define S_CLIPBOARD MULTI_(IDS_COM_BODY_CLIPBOARD)
+
Elm_Entry_Extension_data *ext_mod;
static int _mod_hook_count = 0;
}
static void
+_search_menu(void *data, Evas_Object *obj, void *event_info)
+{
+ if(!ext_mod) return;
+
+ int ret;
+ bundle *b = bundle_create();
+ if (!b)
+ {
+ //printf("bundle_create() failed\n");
+ return;
+ }
+
+ appsvc_set_operation(b, APPSVC_OPERATION_SEARCH);
+ if (ext_mod->selmode)
+ {
+ char *selection = elm_entry_selection_get(ext_mod->caller);
+ if (selection)
+ appsvc_add_data(b, APPSVC_DATA_KEYWORD, selection);
+ }
+ appsvc_run_service(b, 0, NULL, NULL);
+ bundle_free(b);
+ _ctxpopup_hide(obj);
+}
+
+static void
_clipboard_menu(void *data, Evas_Object *obj, void *event_info)
{
if(!ext_mod) return;
{
if (!elm_entry_is_empty(obj))
{
- added_item = elm_ctxpopup_item_append(ext_mod->popup, "Select", NULL, _select, obj );
- added_item = elm_ctxpopup_item_append(ext_mod->popup, "Select All", NULL, _select_all, obj );
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_SELECT, NULL, _select, obj );
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_SELECT_ALL, NULL, _select_all, obj );
}
}
#endif
{
if (ext_mod->editable)
- added_item = elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_PASTE, NULL, _paste, obj );
}
//elm_ctxpopup_item_append(wd->ctxpopup, NULL, "Selectall",_select_all, obj );
// start for cbhm
if ((!ext_mod->password) && (ext_mod->editable))
#endif
{
- icon = elm_icon_add(ext_mod->popup);
- snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
- elm_icon_file_set(icon, buf, NULL);
- added_item = elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_CLIPBOARD, NULL, _clipboard_menu, obj); // Clipboard
//elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj );
}
// end for cbhm
+ icon = elm_icon_add(ext_mod->popup);
+ snprintf(buf, sizeof(buf), "%s/images/copy&paste_icon_search.png", PACKAGE_DATA_DIR);
+ elm_icon_file_set(icon, buf, NULL);
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _search_menu, obj); // Search
}
else
{
{
if (ext_mod->have_selection)
{
- added_item = elm_ctxpopup_item_append(ext_mod->popup, "Copy", NULL, _copy, obj );
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_COPY, NULL, _copy, obj );
if (ext_mod->editable)
- added_item = elm_ctxpopup_item_append(ext_mod->popup, "Cut", NULL, _cut, obj );
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_CUT, NULL, _cut, obj );
#ifdef HAVE_ELEMENTARY_X
if (ext_mod->editable && cbhm_count)
#else
if (ext_mod->editable)
#endif
- added_item = elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_PASTE, NULL, _paste, obj );
}
else
{
_cancel(obj,ext_mod->popup,NULL);
if (!elm_entry_is_empty(obj))
{
- added_item = elm_ctxpopup_item_append(ext_mod->popup, "Select", NULL, _select, obj );
- added_item = elm_ctxpopup_item_append(ext_mod->popup, "Select All", NULL, _select_all, obj );
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_SELECT, NULL, _select, obj );
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_SELECT_ALL, NULL, _select_all, obj );
}
#ifdef HAVE_ELEMENTARY_X
if (cbhm_count)
#endif
{
if (ext_mod->editable)
- added_item = elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_PASTE, NULL, _paste, obj );
}
}
// start for cbhm
if (ext_mod->editable)
#endif
{
- icon = elm_icon_add(ext_mod->popup);
- snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
- elm_icon_file_set(icon, buf, NULL);
- added_item = elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, S_CLIPBOARD, NULL, _clipboard_menu, obj); // Clipboard
//elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj );
}
// end for cbhm
+ icon = elm_icon_add(ext_mod->popup);
+ snprintf(buf, sizeof(buf), "%s/images/copy&paste_icon_search.png", PACKAGE_DATA_DIR);
+ elm_icon_file_set(icon, buf, NULL);
+ added_item = elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _search_menu, obj); // Search
}
}
EINA_LIST_FOREACH(ext_mod->items, l, it)
projects / framework / uifw / elementary.git / commitdiff
