projects
/
framework
/
uifw
/
elementary.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
elementary/popup - [E-devel] [Patch][elementary] elc_popup, focus next hook implement...
[framework/uifw/elementary.git]
/
src
/
lib
/
elc_popup.c
diff --git
a/src/lib/elc_popup.c
b/src/lib/elc_popup.c
index
62731bc
..
74aada0
100644
(file)
--- a/
src/lib/elc_popup.c
+++ b/
src/lib/elc_popup.c
@@
-98,6
+98,8
@@
static Evas_Object *_action_button_get(Evas_Object *obj, unsigned int idx);
static Evas_Object *_action_button_unset(Evas_Object *obj, unsigned int idx);
static void _button_remove(Evas_Object *obj, Evas_Object *content,
Eina_Bool delete);
static Evas_Object *_action_button_unset(Evas_Object *obj, unsigned int idx);
static void _button_remove(Evas_Object *obj, Evas_Object *content,
Eina_Bool delete);
+static void _popup_show(void *data, Evas *e, Evas_Object *obj,
+ void *event_info);
static const char SIG_BLOCK_CLICKED[] = "block,clicked";
static const char SIG_TIMEOUT[] = "timeout";
static const Evas_Smart_Cb_Description _signals[] = {
static const char SIG_BLOCK_CLICKED[] = "block,clicked";
static const char SIG_TIMEOUT[] = "timeout";
static const Evas_Smart_Cb_Description _signals[] = {
@@
-147,6
+149,7
@@
_del_pre_hook(Evas_Object *obj)
evas_object_smart_callback_del(wd->notify, "timeout", _timeout);
evas_object_event_callback_del(wd->notify, EVAS_CALLBACK_RESIZE,
_notify_resize);
evas_object_smart_callback_del(wd->notify, "timeout", _timeout);
evas_object_event_callback_del(wd->notify, EVAS_CALLBACK_RESIZE,
_notify_resize);
+ evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _popup_show);
wd->button_count = 0;
for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++)
if (wd->buttons[i])
wd->button_count = 0;
for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++)
if (wd->buttons[i])
@@
-173,8
+176,6
@@
_theme_hook(Evas_Object *obj)
if (!wd) return;
elm_layout_theme_set(wd->base, "popup", "base", elm_widget_style_get(obj));
if (!wd) return;
elm_layout_theme_set(wd->base, "popup", "base", elm_widget_style_get(obj));
- elm_widget_scale_set(wd->base, elm_widget_scale_get(obj) *
- _elm_config->scale);
_elm_widget_mirrored_reload(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
if (wd->button_count)
_elm_widget_mirrored_reload(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
if (wd->button_count)
@@
-701,11
+702,8
@@
_title_icon_set(Evas_Object *obj, Evas_Object *icon)
if (!wd) return;
if (wd->title_icon == icon) return;
title_visibility_old = (wd->title_text) || (wd->title_icon);
if (!wd) return;
if (wd->title_icon == icon) return;
title_visibility_old = (wd->title_text) || (wd->title_icon);
- if (wd->title_icon)
- {
- evas_object_del(wd->title_icon);
- wd->title_icon = NULL;
- }
+ if (wd->title_icon) evas_object_del(wd->title_icon);
+
wd->title_icon = icon;
title_visibility_current = (wd->title_text) || (wd->title_icon);
elm_object_part_content_set(wd->base, "elm.swallow.title.icon",
wd->title_icon = icon;
title_visibility_current = (wd->title_text) || (wd->title_icon);
elm_object_part_content_set(wd->base, "elm.swallow.title.icon",
@@
-742,6
+740,7
@@
_content_set(Evas_Object *obj, Evas_Object *content)
wd->content_area);
elm_object_part_content_set(wd->content_area, "elm.swallow.content",
content);
wd->content_area);
elm_object_part_content_set(wd->content_area, "elm.swallow.content",
content);
+ evas_object_show(content);
}
_sizing_eval(obj);
}
}
_sizing_eval(obj);
}
@@
-781,11
+780,14
@@
_button_remove(Evas_Object *obj, Evas_Object *content, Eina_Bool delete)
elm_object_part_content_unset(wd->action_area, buf);
elm_object_part_content_set(wd->action_area, buf,
wd->buttons[i]->btn);
elm_object_part_content_unset(wd->action_area, buf);
elm_object_part_content_set(wd->action_area, buf,
wd->buttons[i]->btn);
+ evas_object_show(wd->buttons[i]->btn);
wd->buttons[i]->delete_me = EINA_TRUE;
}
if (!wd->button_count)
{
_layout_set(obj);
wd->buttons[i]->delete_me = EINA_TRUE;
}
if (!wd->button_count)
{
_layout_set(obj);
+ elm_object_part_content_unset(wd->base, "elm.swallow.action_area");
+ evas_object_hide(wd->action_area);
edje_object_message_signal_process(elm_layout_edje_get(wd->base));
}
else
edje_object_message_signal_process(elm_layout_edje_get(wd->base));
}
else
@@
-834,6
+836,7
@@
_action_button_set(Evas_Object *obj, Evas_Object *btn, unsigned int idx)
elm_object_part_content_unset(wd->action_area, buf);
elm_object_part_content_set(wd->action_area, buf,
wd->buttons[i]->btn);
elm_object_part_content_unset(wd->action_area, buf);
elm_object_part_content_set(wd->action_area, buf,
wd->buttons[i]->btn);
+ evas_object_show(wd->buttons[i]->btn);
/* Setting delete_me to TRUE in order to let _sub_del handle it
if deleted externally and update the buttons array after freeing
action data allocated earlier.
/* Setting delete_me to TRUE in order to let _sub_del handle it
if deleted externally and update the buttons array after freeing
action data allocated earlier.
@@
-842,6
+845,7
@@
_action_button_set(Evas_Object *obj, Evas_Object *btn, unsigned int idx)
}
elm_object_part_content_set(wd->base, "elm.swallow.action_area",
wd->action_area);
}
elm_object_part_content_set(wd->base, "elm.swallow.action_area",
wd->action_area);
+ evas_object_show(wd->action_area);
if (wd->button_count == 1)
_layout_set(obj);
edje_object_message_signal_process(wd->base);
if (wd->button_count == 1)
_layout_set(obj);
edje_object_message_signal_process(wd->base);
@@
-1027,13
+1031,17
@@
_content_unset_hook(Evas_Object *obj, const char *part)
}
static Eina_Bool
}
static Eina_Bool
-_focus_next_hook(const Evas_Object *obj
__UNUSED__
,
- Elm_Focus_Direction dir
__UNUSED__
,
- Evas_Object **next
__UNUSED__
)
+_focus_next_hook(const Evas_Object *obj,
+ Elm_Focus_Direction dir,
+ Evas_Object **next)
{
{
- //TODO: Implement Focus chanin Handling in Popup for action area buttons
- return EINA_FALSE;
+ Widget_Data *wd = elm_widget_data_get(obj);
+
+ if (!wd)
+ return EINA_FALSE;
+ return elm_widget_focus_next_get(wd->notify, dir, next);
}
}
+
static void
_item_text_set(Elm_Popup_Content_Item *item, const char *label)
{
static void
_item_text_set(Elm_Popup_Content_Item *item, const char *label)
{
@@
-1080,7
+1088,6
@@
_item_icon_set(Elm_Popup_Content_Item *item, Evas_Object *icon)
if (item->icon == icon) return;
if (item->icon)
{
if (item->icon == icon) return;
if (item->icon)
{
- elm_widget_sub_object_del(WIDGET(item), item->icon);
evas_object_data_del(item->icon, "_popup_content_item");
evas_object_del(item->icon);
}
evas_object_data_del(item->icon, "_popup_content_item");
evas_object_del(item->icon);
}
@@
-1199,6
+1206,18
@@
_item_signal_emit_hook(Elm_Object_Item *it, const char *emission,
edje_object_signal_emit(VIEW(item), emission, source);
}
edje_object_signal_emit(VIEW(item), emission, source);
}
+static void
+_popup_show(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
+ void *event_info __UNUSED__)
+{
+ Widget_Data *wd;
+
+ wd = elm_widget_data_get(obj);
+ if (!wd) return;
+
+ evas_object_show(wd->notify);
+}
+
EAPI Evas_Object *
elm_popup_add(Evas_Object *parent)
{
EAPI Evas_Object *
elm_popup_add(Evas_Object *parent)
{
@@
-1220,11
+1239,11
@@
elm_popup_add(Evas_Object *parent)
elm_widget_content_set_hook_set(obj, _content_set_hook);
elm_widget_content_get_hook_set(obj, _content_get_hook);
elm_widget_content_unset_hook_set(obj,_content_unset_hook);
elm_widget_content_set_hook_set(obj, _content_set_hook);
elm_widget_content_get_hook_set(obj, _content_get_hook);
elm_widget_content_unset_hook_set(obj,_content_unset_hook);
+ elm_widget_can_focus_set(obj, EINA_FALSE);
elm_widget_focus_next_hook_set(obj, _focus_next_hook);
evas_object_smart_callbacks_descriptions_set(obj, _signals);
wd->notify = elm_notify_add(obj);
elm_widget_focus_next_hook_set(obj, _focus_next_hook);
evas_object_smart_callbacks_descriptions_set(obj, _signals);
wd->notify = elm_notify_add(obj);
- elm_widget_resize_object_set(obj, wd->notify);
elm_notify_parent_set(wd->notify, parent);
elm_notify_orient_set(wd->notify, ELM_NOTIFY_ORIENT_CENTER);
elm_notify_allow_events_set(wd->notify, EINA_FALSE);
elm_notify_parent_set(wd->notify, parent);
elm_notify_orient_set(wd->notify, ELM_NOTIFY_ORIENT_CENTER);
elm_notify_allow_events_set(wd->notify, EINA_FALSE);
@@
-1235,6
+1254,8
@@
elm_popup_add(Evas_Object *parent)
evas_object_event_callback_add(wd->notify, EVAS_CALLBACK_RESIZE,
_notify_resize, obj);
evas_object_event_callback_add(wd->notify, EVAS_CALLBACK_RESIZE,
_notify_resize, obj);
+ evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _popup_show,
+ NULL);
evas_object_event_callback_add(obj, EVAS_CALLBACK_RESTACK, _restack, NULL);
wd->base = elm_layout_add(obj);
evas_object_size_hint_weight_set(wd->base, EVAS_HINT_EXPAND,
evas_object_event_callback_add(obj, EVAS_CALLBACK_RESTACK, _restack, NULL);
wd->base = elm_layout_add(obj);
evas_object_size_hint_weight_set(wd->base, EVAS_HINT_EXPAND,
@@
-1306,7
+1327,7
@@
elm_popup_content_text_wrap_type_set(Evas_Object *obj, Elm_Wrap_Type wrap)
}
EAPI Elm_Wrap_Type
}
EAPI Elm_Wrap_Type
-elm_popup_content_text_wrap_type_get(Evas_Object *obj)
+elm_popup_content_text_wrap_type_get(
const
Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) ELM_WRAP_LAST;
Widget_Data *wd = elm_widget_data_get(obj);
{
ELM_CHECK_WIDTYPE(obj, widtype) ELM_WRAP_LAST;
Widget_Data *wd = elm_widget_data_get(obj);