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

elementary / menu, notify, list, panes, module, map, pager, panel, mapbuf - removed white spaces 

SVN revision: 58251
This commit is contained in:
ChunEon Park 2011-04-01 11:26:58 +00:00
parent 711b428aae
commit 160084626b
9 changed files with 1272 additions and 1272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
legacy/elementary/src/lib/elm_list.c
View File

@ -25,7 +25,7 @@ struct _Widget_Data
int walking; int walking;
int movements; int movements;
struct { struct {
Evas_Coord x, y; Evas_Coord x, y;
} history[SWIPE_MOVES]; } history[SWIPE_MOVES];
Eina_Bool swipe : 1; Eina_Bool swipe : 1;
Eina_Bool fix_pending : 1; Eina_Bool fix_pending : 1;
@ -85,32 +85,32 @@ static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src,
static Eina_Bool _deselect_all_items(Widget_Data *wd); static Eina_Bool _deselect_all_items(Widget_Data *wd);
#define ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, ...) \ #define ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, ...) \
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, __VA_ARGS__); \ ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, __VA_ARGS__); \
if (it->deleted) \ if (it->deleted) \
{ \ { \
ERR("ERROR: "#it" has been DELETED.\n"); \ ERR("ERROR: "#it" has been DELETED.\n"); \
return __VA_ARGS__; \ return __VA_ARGS__; \
} }
static inline void static inline void
_elm_list_item_free(Elm_List_Item *it) _elm_list_item_free(Elm_List_Item *it)
{ {
evas_object_event_callback_del_full evas_object_event_callback_del_full
(it->base.view, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, it); (it->base.view, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, it);
evas_object_event_callback_del_full evas_object_event_callback_del_full
(it->base.view, EVAS_CALLBACK_MOUSE_UP, _mouse_up, it); (it->base.view, EVAS_CALLBACK_MOUSE_UP, _mouse_up, it);
evas_object_event_callback_del_full evas_object_event_callback_del_full
(it->base.view, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, it); (it->base.view, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, it);
if (it->icon) if (it->icon)
evas_object_event_callback_del_full evas_object_event_callback_del_full
(it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, it->base.widget); _changed_size_hints, it->base.widget);
if (it->end) if (it->end)
evas_object_event_callback_del_full evas_object_event_callback_del_full
(it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, it->base.widget); _changed_size_hints, it->base.widget);
eina_stringshare_del(it->label); eina_stringshare_del(it->label);
@ -259,9 +259,9 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
} }
else if (!strcmp(ev->keyname, "Escape")) else if (!strcmp(ev->keyname, "Escape"))
{ {
if (!_deselect_all_items(wd)) return EINA_FALSE; if (!_deselect_all_items(wd)) return EINA_FALSE;
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE; return EINA_TRUE;
} }
else return EINA_FALSE; else return EINA_FALSE;
@ -383,8 +383,8 @@ _elm_list_walk(Widget_Data *wd)
{ {
if (wd->walking < 0) if (wd->walking < 0)
{ {
ERR("ERROR: walking was negative. fixed!\n"); ERR("ERROR: walking was negative. fixed!\n");
wd->walking = 0; wd->walking = 0;
} }
wd->walking++; wd->walking++;
} }
@ -395,8 +395,8 @@ _elm_list_unwalk(Widget_Data *wd)
wd->walking--; wd->walking--;
if (wd->walking < 0) if (wd->walking < 0)
{ {
ERR("ERROR: walking became negative. fixed!\n"); ERR("ERROR: walking became negative. fixed!\n");
wd->walking = 0; wd->walking = 0;
} }
if (wd->walking) if (wd->walking)
@ -531,8 +531,8 @@ _signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *so
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
edje_object_signal_callback_del_full( edje_object_signal_callback_del_full(
elm_smart_scroller_edje_object_get(wd->scr), elm_smart_scroller_edje_object_get(wd->scr),
emission, source, func_cb, data); emission, source, func_cb, data);
} }
static void static void
@ -568,7 +568,7 @@ _theme_hook(Evas_Object *obj)
elm_smart_scroller_object_theme_set(obj, wd->scr, "list", "base", elm_smart_scroller_object_theme_set(obj, wd->scr, "list", "base",
elm_widget_style_get(obj)); elm_widget_style_get(obj));
// edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale); // edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
edj = elm_smart_scroller_edje_object_get(wd->scr); edj = elm_smart_scroller_edje_object_get(wd->scr);
str = edje_object_data_get(edj, "focus_highlight"); str = edje_object_data_get(edj, "focus_highlight");
if ((str) && (!strcmp(str, "on"))) if ((str) && (!strcmp(str, "on")))
@ -636,8 +636,8 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
if (it->icon == sub) it->icon = NULL; if (it->icon == sub) it->icon = NULL;
if (it->end == sub) it->end = NULL; if (it->end == sub) it->end = NULL;
evas_object_event_callback_del_full evas_object_event_callback_del_full
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints,
obj); obj);
if (!wd->walking) if (!wd->walking)
{ {
_fix_items(obj); _fix_items(obj);
@ -661,7 +661,7 @@ _item_hilight(Elm_List_Item *it)
if (!wd) return; if (!wd) return;
ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); ELM_LIST_ITEM_CHECK_DELETED_RETURN(it);
if (it->hilighted) return; if (it->hilighted) return;
evas_object_ref(obj); evas_object_ref(obj);
_elm_list_walk(wd); _elm_list_walk(wd);
@ -690,11 +690,11 @@ _item_select(Elm_List_Item *it)
} }
it->selected = EINA_TRUE; it->selected = EINA_TRUE;
wd->selected = eina_list_append(wd->selected, it); wd->selected = eina_list_append(wd->selected, it);
call: call:
evas_object_ref(obj); evas_object_ref(obj);
_elm_list_walk(wd); _elm_list_walk(wd);
if (it->func) it->func((void *)it->base.data, it->base.widget, it); if (it->func) it->func((void *)it->base.data, it->base.widget, it);
evas_object_smart_callback_call(obj, "selected", it); evas_object_smart_callback_call(obj, "selected", it);
it->wd->last_selected_item = it; it->wd->last_selected_item = it;
@ -713,17 +713,17 @@ _item_unselect(Elm_List_Item *it)
if (!wd) return; if (!wd) return;
ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); ELM_LIST_ITEM_CHECK_DELETED_RETURN(it);
if (!it->hilighted) return; if (!it->hilighted) return;
evas_object_ref(obj); evas_object_ref(obj);
_elm_list_walk(wd); _elm_list_walk(wd);
edje_object_signal_emit(it->base.view, "elm,state,unselected", "elm"); edje_object_signal_emit(it->base.view, "elm,state,unselected", "elm");
stacking = edje_object_data_get(it->base.view, "stacking"); stacking = edje_object_data_get(it->base.view, "stacking");
selectraise = edje_object_data_get(it->base.view, "selectraise"); selectraise = edje_object_data_get(it->base.view, "selectraise");
if ((selectraise) && (!strcmp(selectraise, "on"))) if ((selectraise) && (!strcmp(selectraise, "on")))
{ {
if ((stacking) && (!strcmp(stacking, "below"))) if ((stacking) && (!strcmp(stacking, "below")))
evas_object_lower(it->base.view); evas_object_lower(it->base.view);
} }
it->hilighted = EINA_FALSE; it->hilighted = EINA_FALSE;
if (it->selected) if (it->selected)
@ -732,7 +732,7 @@ _item_unselect(Elm_List_Item *it)
wd->selected = eina_list_remove(wd->selected, it); wd->selected = eina_list_remove(wd->selected, it);
evas_object_smart_callback_call(it->base.widget, "unselected", it); evas_object_smart_callback_call(it->base.widget, "unselected", it);
} }
_elm_list_unwalk(wd); _elm_list_unwalk(wd);
evas_object_unref(obj); evas_object_unref(obj);
} }
@ -760,10 +760,10 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
if (!wd) return; if (!wd) return;
ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); ELM_LIST_ITEM_CHECK_DELETED_RETURN(it);
evas_object_ref(obj2); evas_object_ref(obj2);
_elm_list_walk(wd); _elm_list_walk(wd);
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
{ {
if (!wd->on_hold) if (!wd->on_hold)
@ -783,12 +783,12 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
wd->history[wd->movements].x = ev->cur.canvas.x; wd->history[wd->movements].x = ev->cur.canvas.x;
wd->history[wd->movements].y = ev->cur.canvas.y; wd->history[wd->movements].y = ev->cur.canvas.y;
if (abs((wd->history[wd->movements].x - wd->history[0].x)) > 40) if (abs((wd->history[wd->movements].x - wd->history[0].x)) > 40)
wd->swipe = EINA_TRUE; wd->swipe = EINA_TRUE;
else else
wd->movements++; wd->movements++;
} }
} }
_elm_list_unwalk(wd); _elm_list_unwalk(wd);
evas_object_unref(obj2); evas_object_unref(obj2);
} }
@ -837,7 +837,7 @@ _long_press(void *data)
wd->longpressed = EINA_TRUE; wd->longpressed = EINA_TRUE;
evas_object_smart_callback_call(it->base.widget, "longpressed", it); evas_object_smart_callback_call(it->base.widget, "longpressed", it);
end: end:
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
@ -876,10 +876,10 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
else wd->on_hold = EINA_FALSE; else wd->on_hold = EINA_FALSE;
if (wd->on_hold) return; if (wd->on_hold) return;
wd->wasselected = it->selected; wd->wasselected = it->selected;
evas_object_ref(obj2); evas_object_ref(obj2);
_elm_list_walk(wd); _elm_list_walk(wd);
_item_hilight(it); _item_hilight(it);
wd->longpressed = EINA_FALSE; wd->longpressed = EINA_FALSE;
if (it->long_timer) ecore_timer_del(it->long_timer); if (it->long_timer) ecore_timer_del(it->long_timer);
@ -891,7 +891,7 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
evas_object_smart_callback_call(it->base.widget, "clicked", it); evas_object_smart_callback_call(it->base.widget, "clicked", it);
wd->swipe = EINA_FALSE; wd->swipe = EINA_FALSE;
wd->movements = 0; wd->movements = 0;
_elm_list_unwalk(wd); _elm_list_unwalk(wd);
evas_object_unref(obj2); evas_object_unref(obj2);
} }
@ -936,7 +936,7 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *
if (it->disabled) if (it->disabled)
return; return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
evas_object_ref(obj2); evas_object_ref(obj2);
_elm_list_walk(wd); _elm_list_walk(wd);
@ -954,7 +954,7 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *
if (!it->selected) if (!it->selected)
{ {
while (wd->selected) while (wd->selected)
_item_unselect(wd->selected->data); _item_unselect(wd->selected->data);
_item_hilight(it); _item_hilight(it);
_item_select(it); _item_select(it);
} }
@ -1100,116 +1100,116 @@ _fix_items(Evas_Object *obj)
i = 0; i = 0;
EINA_LIST_FOREACH(wd->items, l, it) EINA_LIST_FOREACH(wd->items, l, it)
{ {
if (it->deleted) if (it->deleted)
continue; continue;
it->even = i & 0x1; it->even = i & 0x1;
if ((it->even != it->is_even) || (!it->fixed) || (redo)) if ((it->even != it->is_even) || (!it->fixed) || (redo))
{ {
const char *stacking; const char *stacking;
/* FIXME: separators' themes seem to be b0rked */ /* FIXME: separators' themes seem to be b0rked */
if (it->is_separator) if (it->is_separator)
_elm_theme_object_set(obj, it->base.view, "separator", _elm_theme_object_set(obj, it->base.view, "separator",
wd->h_mode ? "horizontal" : "vertical", wd->h_mode ? "horizontal" : "vertical",
style); style);
else if (wd->mode == ELM_LIST_COMPRESS) else if (wd->mode == ELM_LIST_COMPRESS)
{ {
if (it->even) if (it->even)
_elm_theme_object_set(obj, it->base.view, "list", _elm_theme_object_set(obj, it->base.view, "list",
it_compress, style); it_compress, style);
else else
_elm_theme_object_set(obj, it->base.view, "list", _elm_theme_object_set(obj, it->base.view, "list",
it_compress_odd, style); it_compress_odd, style);
} }
else else
{ {
if (it->even) if (it->even)
_elm_theme_object_set(obj, it->base.view, "list", it_plain, _elm_theme_object_set(obj, it->base.view, "list", it_plain,
style); style);
else else
_elm_theme_object_set(obj, it->base.view, "list", it_odd, _elm_theme_object_set(obj, it->base.view, "list", it_odd,
style); style);
} }
stacking = edje_object_data_get(it->base.view, "stacking"); stacking = edje_object_data_get(it->base.view, "stacking");
if (stacking) if (stacking)
{ {
if (!strcmp(stacking, "below")) if (!strcmp(stacking, "below"))
evas_object_lower(it->base.view); evas_object_lower(it->base.view);
else if (!strcmp(stacking, "above")) else if (!strcmp(stacking, "above"))
evas_object_raise(it->base.view); evas_object_raise(it->base.view);
} }
edje_object_part_text_set(it->base.view, "elm.text", it->label); edje_object_part_text_set(it->base.view, "elm.text", it->label);
if ((!it->icon) && (minh[0] > 0)) if ((!it->icon) && (minh[0] > 0))
{ {
it->icon = evas_object_rectangle_add(evas_object_evas_get(it->base.view)); it->icon = evas_object_rectangle_add(evas_object_evas_get(it->base.view));
evas_object_color_set(it->icon, 0, 0, 0, 0); evas_object_color_set(it->icon, 0, 0, 0, 0);
it->dummy_icon = EINA_TRUE; it->dummy_icon = EINA_TRUE;
} }
if ((!it->end) && (minh[1] > 0)) if ((!it->end) && (minh[1] > 0))
{ {
it->end = evas_object_rectangle_add(evas_object_evas_get(it->base.view)); it->end = evas_object_rectangle_add(evas_object_evas_get(it->base.view));
evas_object_color_set(it->end, 0, 0, 0, 0); evas_object_color_set(it->end, 0, 0, 0, 0);
it->dummy_end = EINA_TRUE; it->dummy_end = EINA_TRUE;
} }
if (it->icon) if (it->icon)
{ {
evas_object_size_hint_min_set(it->icon, minw[0], minh[0]); evas_object_size_hint_min_set(it->icon, minw[0], minh[0]);
evas_object_size_hint_max_set(it->icon, 99999, 99999); evas_object_size_hint_max_set(it->icon, 99999, 99999);
edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon); edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon);
} }
if (it->end) if (it->end)
{ {
evas_object_size_hint_min_set(it->end, minw[1], minh[1]); evas_object_size_hint_min_set(it->end, minw[1], minh[1]);
evas_object_size_hint_max_set(it->end, 99999, 99999); evas_object_size_hint_max_set(it->end, 99999, 99999);
edje_object_part_swallow(it->base.view, "elm.swallow.end", it->end); edje_object_part_swallow(it->base.view, "elm.swallow.end", it->end);
} }
if (!it->fixed) if (!it->fixed)
{ {
// this may call up user and it may modify the list item // this may call up user and it may modify the list item
// but we're safe as we're flagged as walking. // but we're safe as we're flagged as walking.
// just don't process further // just don't process further
edje_object_message_signal_process(it->base.view); edje_object_message_signal_process(it->base.view);
if (it->deleted) if (it->deleted)
continue; continue;
mw = mh = -1; mw = mh = -1;
elm_coords_finger_size_adjust(1, &mw, 1, &mh); elm_coords_finger_size_adjust(1, &mw, 1, &mh);
edje_object_size_min_restricted_calc(it->base.view, &mw, &mh, mw, mh); edje_object_size_min_restricted_calc(it->base.view, &mw, &mh, mw, mh);
elm_coords_finger_size_adjust(1, &mw, 1, &mh); elm_coords_finger_size_adjust(1, &mw, 1, &mh);
evas_object_size_hint_min_set(it->base.view, mw, mh); evas_object_size_hint_min_set(it->base.view, mw, mh);
evas_object_show(it->base.view); evas_object_show(it->base.view);
} }
if ((it->selected) || (it->hilighted)) if ((it->selected) || (it->hilighted))
{ {
const char *selectraise; const char *selectraise;
// this may call up user and it may modify the list item // this may call up user and it may modify the list item
// but we're safe as we're flagged as walking. // but we're safe as we're flagged as walking.
// just don't process further // just don't process further
edje_object_signal_emit(it->base.view, "elm,state,selected", "elm"); edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
if (it->deleted) if (it->deleted)
continue; continue;
selectraise = edje_object_data_get(it->base.view, "selectraise"); selectraise = edje_object_data_get(it->base.view, "selectraise");
if ((selectraise) && (!strcmp(selectraise, "on"))) if ((selectraise) && (!strcmp(selectraise, "on")))
evas_object_raise(it->base.view); evas_object_raise(it->base.view);
} }
if (it->disabled) if (it->disabled)
edje_object_signal_emit(it->base.view, "elm,state,disabled", edje_object_signal_emit(it->base.view, "elm,state,disabled",
"elm"); "elm");
it->fixed = EINA_TRUE; it->fixed = EINA_TRUE;
it->is_even = it->even; it->is_even = it->even;
} }
i++; i++;
} }
mw = 0; mh = 0; mw = 0; mh = 0;
evas_object_size_hint_min_get(wd->box, &mw, &mh); evas_object_size_hint_min_get(wd->box, &mw, &mh);
_elm_list_mode_set_internal(wd); _elm_list_mode_set_internal(wd);
_elm_list_unwalk(wd); _elm_list_unwalk(wd);
evas_object_unref(obj); evas_object_unref(obj);
} }
@ -1273,7 +1273,7 @@ elm_list_add(Evas_Object *parent)
Evas_Coord minw, minh; Evas_Coord minw, minh;
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
ELM_SET_WIDTYPE(widtype, "list"); ELM_SET_WIDTYPE(widtype, "list");
elm_widget_type_set(obj, "list"); elm_widget_type_set(obj, "list");
elm_widget_sub_object_add(parent, obj); elm_widget_sub_object_add(parent, obj);
@ -1873,13 +1873,13 @@ elm_list_item_selected_set(Elm_List_Item *it, Eina_Bool selected)
if (!wd->multi) if (!wd->multi)
{ {
while (wd->selected) while (wd->selected)
_item_unselect(wd->selected->data); _item_unselect(wd->selected->data);
} }
_item_hilight(it); _item_hilight(it);
_item_select(it); _item_select(it);
} }
else else
_item_unselect(it); _item_unselect(it);
_elm_list_unwalk(wd); _elm_list_unwalk(wd);
evas_object_unref(obj); evas_object_unref(obj);
@ -2487,8 +2487,8 @@ elm_list_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm
if (!wd) return; if (!wd) return;
if ((policy_h >= ELM_SCROLLER_POLICY_LAST) || if ((policy_h >= ELM_SCROLLER_POLICY_LAST) ||
(policy_v >= ELM_SCROLLER_POLICY_LAST)) (policy_v >= ELM_SCROLLER_POLICY_LAST))
if (wd->scr) if (wd->scr)
elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v); elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v);
} }
EAPI void EAPI void

1628
legacy/elementary/src/lib/elm_map.c
View File

File diff suppressed because it is too large Load Diff

32
legacy/elementary/src/lib/elm_mapbuf.c
View File

@ -72,10 +72,10 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
if (!wd) return; if (!wd) return;
if (sub == wd->content) if (sub == wd->content)
{ {
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj); _changed_size_hints, obj);
wd->content = NULL; wd->content = NULL;
_sizing_eval(obj); _sizing_eval(obj);
} }
} }
@ -121,17 +121,17 @@ _configure(Evas_Object *obj)
if ((x != x2) || (y != y2)) if ((x != x2) || (y != y2))
{ {
if (!wd->enabled) if (!wd->enabled)
evas_object_move(wd->content, x, y); evas_object_move(wd->content, x, y);
else else
{ {
Evas *e = evas_object_evas_get(obj); Evas *e = evas_object_evas_get(obj);
evas_smart_objects_calculate(e); evas_smart_objects_calculate(e);
evas_nochange_push(e); evas_nochange_push(e);
// printf("x-------------------- %i %i\n", x, y); // printf("x-------------------- %i %i\n", x, y);
evas_object_move(wd->content, x, y); evas_object_move(wd->content, x, y);
evas_smart_objects_calculate(e); evas_smart_objects_calculate(e);
// printf("y--------------------\n"); // printf("y--------------------\n");
evas_nochange_pop(e); evas_nochange_pop(e);
} }
} }
@ -148,7 +148,7 @@ _move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, vo
static void static void
_resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{ {
_configure(data); _configure(data);
} }
@ -168,7 +168,7 @@ elm_mapbuf_add(Evas_Object *parent)
Widget_Data *wd; Widget_Data *wd;
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
ELM_SET_WIDTYPE(widtype, "mapbuf"); ELM_SET_WIDTYPE(widtype, "mapbuf");
elm_widget_type_set(obj, "mapbuf"); elm_widget_type_set(obj, "mapbuf");
elm_widget_sub_object_add(parent, obj); elm_widget_sub_object_add(parent, obj);
@ -185,13 +185,13 @@ elm_mapbuf_add(Evas_Object *parent)
evas_object_event_callback_add(wd->clip, EVAS_CALLBACK_MOVE, _move, obj); evas_object_event_callback_add(wd->clip, EVAS_CALLBACK_MOVE, _move, obj);
evas_object_event_callback_add(wd->clip, EVAS_CALLBACK_RESIZE, _resize, obj); evas_object_event_callback_add(wd->clip, EVAS_CALLBACK_RESIZE, _resize, obj);
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
elm_widget_resize_object_set(obj, wd->clip); elm_widget_resize_object_set(obj, wd->clip);
wd->enabled = 0; wd->enabled = 0;
wd->alpha = 1; wd->alpha = 1;
wd->smooth = 1; wd->smooth = 1;
_sizing_eval(obj); _sizing_eval(obj);
return obj; return obj;
} }
@ -220,13 +220,13 @@ elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content)
if (content) if (content)
{ {
evas_object_data_set(content, "_elm_leaveme", (void *)1); evas_object_data_set(content, "_elm_leaveme", (void *)1);
elm_widget_sub_object_add(content, obj); elm_widget_sub_object_add(content, obj);
evas_object_smart_member_add(content, obj); evas_object_smart_member_add(content, obj);
evas_object_clip_set(content, wd->clip); evas_object_clip_set(content, wd->clip);
evas_object_color_set(wd->clip, 255, 255, 255, 255); evas_object_color_set(wd->clip, 255, 255, 255, 255);
evas_object_event_callback_add(content, evas_object_event_callback_add(content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj); _changed_size_hints, obj);
} }
else else
evas_object_color_set(wd->clip, 0, 0, 0, 0); evas_object_color_set(wd->clip, 0, 0, 0, 0);

148
legacy/elementary/src/lib/elm_menu.c
View File

@ -79,7 +79,7 @@ _del_pre_hook(Evas_Object *obj)
evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd); evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd);
EINA_LIST_FREE(wd->items, item) EINA_LIST_FREE(wd->items, item)
_del_item(item); _del_item(item);
if (wd->hv) evas_object_del(wd->hv); if (wd->hv) evas_object_del(wd->hv);
if (wd->location) evas_object_del(wd->location); if (wd->location) evas_object_del(wd->location);
@ -103,38 +103,38 @@ _theme_hook(Evas_Object *obj)
ll = eina_list_append(ll, wd->items); ll = eina_list_append(ll, wd->items);
EINA_LIST_FOREACH(ll, _ll, l) EINA_LIST_FOREACH(ll, _ll, l)
{ {
EINA_LIST_FOREACH(l, _l, item) EINA_LIST_FOREACH(l, _l, item)
{ {
edje_object_mirrored_set(item->base.view, elm_widget_mirrored_get(obj)); edje_object_mirrored_set(item->base.view, elm_widget_mirrored_get(obj));
ll = eina_list_append(ll, item->submenu.items); ll = eina_list_append(ll, item->submenu.items);
if (item->separator) if (item->separator)
_elm_theme_object_set(obj, item->base.view, "menu", "separator", _elm_theme_object_set(obj, item->base.view, "menu", "separator",
elm_widget_style_get(obj)); elm_widget_style_get(obj));
else if (item->submenu.bx) else if (item->submenu.bx)
{ {
_elm_theme_object_set _elm_theme_object_set
(obj, item->base.view, "menu", "item_with_submenu", (obj, item->base.view, "menu", "item_with_submenu",
elm_widget_style_get(obj)); elm_widget_style_get(obj));
elm_menu_item_label_set(item, item->label); elm_menu_item_label_set(item, item->label);
elm_menu_item_icon_set(item, item->icon_str); elm_menu_item_icon_set(item, item->icon_str);
} }
else else
{ {
_elm_theme_object_set(obj, item->base.view, "menu", "item", _elm_theme_object_set(obj, item->base.view, "menu", "item",
elm_widget_style_get(obj)); elm_widget_style_get(obj));
elm_menu_item_label_set(item, item->label); elm_menu_item_label_set(item, item->label);
elm_menu_item_icon_set(item, item->icon_str); elm_menu_item_icon_set(item, item->icon_str);
} }
if (item->disabled) if (item->disabled)
edje_object_signal_emit edje_object_signal_emit
(item->base.view, "elm,state,disabled", "elm"); (item->base.view, "elm,state,disabled", "elm");
else else
edje_object_signal_emit edje_object_signal_emit
(item->base.view, "elm,state,enabled", "elm"); (item->base.view, "elm,state,enabled", "elm");
edje_object_message_signal_process(item->base.view); edje_object_message_signal_process(item->base.view);
edje_object_scale_set(item->base.view, elm_widget_scale_get(obj) * edje_object_scale_set(item->base.view, elm_widget_scale_get(obj) *
_elm_config->scale); _elm_config->scale);
} }
} }
_sizing_eval(obj); _sizing_eval(obj);
} }
@ -173,7 +173,7 @@ _sizing_eval(Evas_Object *obj)
EINA_LIST_FOREACH(wd->items,l,item) EINA_LIST_FOREACH(wd->items,l,item)
{ {
if (item->submenu.open) _submenu_sizing_eval(item); if (item->submenu.open) _submenu_sizing_eval(item);
} }
} }
@ -220,8 +220,8 @@ _submenu_sizing_eval(Elm_Menu_Item *parent)
EINA_LIST_FOREACH(parent->submenu.items, l, item) EINA_LIST_FOREACH(parent->submenu.items, l, item)
{ {
if (item->submenu.open) if (item->submenu.open)
_submenu_sizing_eval(item); _submenu_sizing_eval(item);
} }
} }
@ -284,7 +284,7 @@ _menu_hide(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
EINA_LIST_FOREACH(wd->items, l, item2) EINA_LIST_FOREACH(wd->items, l, item2)
{ {
if (item2->submenu.open) _submenu_hide(item2); if (item2->submenu.open) _submenu_hide(item2);
} }
} }
@ -297,7 +297,7 @@ _submenu_hide(Elm_Menu_Item *item)
item->submenu.open = EINA_FALSE; item->submenu.open = EINA_FALSE;
EINA_LIST_FOREACH(item->submenu.items, l, item2) EINA_LIST_FOREACH(item->submenu.items, l, item2)
{ {
if (item2->submenu.open) _submenu_hide(item2); if (item2->submenu.open) _submenu_hide(item2);
} }
} }
@ -307,8 +307,8 @@ _menu_item_select(void *data, Evas_Object *obj __UNUSED__, const char *emission
Elm_Menu_Item *item = data; Elm_Menu_Item *item = data;
if (item->submenu.items) if (item->submenu.items)
{ {
if (!item->submenu.open) _submenu_open(item, NULL, NULL, NULL); if (!item->submenu.open) _submenu_open(item, NULL, NULL, NULL);
else _submenu_hide(item); else _submenu_hide(item);
} }
else else
_menu_hide(item->base.widget, NULL, NULL); _menu_hide(item->base.widget, NULL, NULL);
@ -325,18 +325,18 @@ _menu_item_activate(void *data, Evas_Object *obj __UNUSED__, const char *emissio
item->selected = 1; item->selected = 1;
if (item->parent) if (item->parent)
{ {
EINA_LIST_FOREACH(item->parent->submenu.items, l, item2) EINA_LIST_FOREACH(item->parent->submenu.items, l, item2)
{ {
if (item2 != item) elm_menu_item_selected_set(item2, 0); if (item2 != item) elm_menu_item_selected_set(item2, 0);
} }
} }
else else
{ {
Widget_Data *wd = elm_widget_data_get(item->base.widget); Widget_Data *wd = elm_widget_data_get(item->base.widget);
EINA_LIST_FOREACH(wd->items, l, item2) EINA_LIST_FOREACH(wd->items, l, item2)
{ {
if (item2 != item) elm_menu_item_selected_set(item2, 0); if (item2 != item) elm_menu_item_selected_set(item2, 0);
} }
} }
} }
@ -445,7 +445,7 @@ elm_menu_add(Evas_Object *parent)
Widget_Data *wd; Widget_Data *wd;
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
ELM_SET_WIDTYPE(widtype, "menu"); ELM_SET_WIDTYPE(widtype, "menu");
elm_widget_type_set(obj, "menu"); elm_widget_type_set(obj, "menu");
elm_widget_sub_object_add(parent, obj); elm_widget_sub_object_add(parent, obj);
@ -503,28 +503,28 @@ elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent)
if (wd->parent == parent) return; if (wd->parent == parent) return;
if (wd->parent) if (wd->parent)
{ {
evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, wd->obj); evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, wd->obj);
evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd); evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd);
} }
wd->parent = parent; wd->parent = parent;
if (wd->parent) if (wd->parent)
{ {
evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, wd->obj); evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, wd->obj);
evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd); evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd);
} }
elm_hover_parent_set(wd->hv, parent); elm_hover_parent_set(wd->hv, parent);
ll = eina_list_append(ll, wd->items); ll = eina_list_append(ll, wd->items);
EINA_LIST_FOREACH(ll, _ll, l) EINA_LIST_FOREACH(ll, _ll, l)
{ {
EINA_LIST_FOREACH(l, _l, item) EINA_LIST_FOREACH(l, _l, item)
{ {
if (item->submenu.hv) if (item->submenu.hv)
{ {
elm_hover_parent_set(item->submenu.hv, parent); elm_hover_parent_set(item->submenu.hv, parent);
ll = eina_list_append(ll, item->submenu.items); ll = eina_list_append(ll, item->submenu.items);
} }
} }
} }
_sizing_eval(obj); _sizing_eval(obj);
} }
@ -603,9 +603,9 @@ _item_clone(Evas_Object *obj, Elm_Menu_Item *parent, Elm_Menu_Item *item)
Eina_List *iter; Eina_List *iter;
if (item->separator) if (item->separator)
new_item = elm_menu_item_separator_add(obj, parent); new_item = elm_menu_item_separator_add(obj, parent);
else else
new_item = elm_menu_item_add(obj, parent, item->icon_str, item->label, item->func, item->base.data); new_item = elm_menu_item_add(obj, parent, item->icon_str, item->label, item->func, item->base.data);
elm_menu_item_disabled_set(new_item, item->disabled); elm_menu_item_disabled_set(new_item, item->disabled);
EINA_LIST_FOREACH(item->submenu.items, iter, subitem) EINA_LIST_FOREACH(item->submenu.items, iter, subitem)
@ -669,14 +669,14 @@ elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, const char *icon, con
if (parent) if (parent)
{ {
if (!parent->submenu.bx) _item_submenu_obj_create(parent); if (!parent->submenu.bx) _item_submenu_obj_create(parent);
elm_box_pack_end(parent->submenu.bx, subitem->base.view); elm_box_pack_end(parent->submenu.bx, subitem->base.view);
parent->submenu.items = eina_list_append(parent->submenu.items, subitem); parent->submenu.items = eina_list_append(parent->submenu.items, subitem);
} }
else else
{ {
elm_box_pack_end(wd->bx, subitem->base.view); elm_box_pack_end(wd->bx, subitem->base.view);
wd->items = eina_list_append(wd->items, subitem); wd->items = eina_list_append(wd->items, subitem);
} }
_sizing_eval(obj); _sizing_eval(obj);
@ -744,7 +744,7 @@ elm_menu_item_icon_set(Elm_Menu_Item *item, const char *icon)
(elm_icon_standard_set(item->icon, icon_tmp))) (elm_icon_standard_set(item->icon, icon_tmp)))
{ {
eina_stringshare_replace(&item->icon_str, icon); eina_stringshare_replace(&item->icon_str, icon);
edje_object_signal_emit(item->base.view, "elm,state,icon,visible", "elm"); edje_object_signal_emit(item->base.view, "elm,state,icon,visible", "elm");
} }
else else
edje_object_signal_emit(item->base.view, "elm,state,icon,hidden", "elm"); edje_object_signal_emit(item->base.view, "elm,state,icon,hidden", "elm");
@ -822,14 +822,14 @@ elm_menu_item_separator_add(Evas_Object *obj, Elm_Menu_Item *parent)
_item_separator_obj_create(subitem); _item_separator_obj_create(subitem);
if (!parent) if (!parent)
{ {
elm_box_pack_end(wd->bx, subitem->base.view); elm_box_pack_end(wd->bx, subitem->base.view);
wd->items = eina_list_append(wd->items, subitem); wd->items = eina_list_append(wd->items, subitem);
} }
else else
{ {
if (!parent->submenu.bx) _item_submenu_obj_create(parent); if (!parent->submenu.bx) _item_submenu_obj_create(parent);
elm_box_pack_end(parent->submenu.bx, subitem->base.view); elm_box_pack_end(parent->submenu.bx, subitem->base.view);
parent->submenu.items = eina_list_append(parent->submenu.items, subitem); parent->submenu.items = eina_list_append(parent->submenu.items, subitem);
} }
_sizing_eval(obj); _sizing_eval(obj);
return subitem; return subitem;
@ -902,11 +902,11 @@ elm_menu_item_del(Elm_Menu_Item *item)
if (item->submenu.location) evas_object_del(item->submenu.location); if (item->submenu.location) evas_object_del(item->submenu.location);
if (item->parent) if (item->parent)
item->parent->submenu.items = eina_list_remove(item->parent->submenu.items, item); item->parent->submenu.items = eina_list_remove(item->parent->submenu.items, item);
else else
{ {
Widget_Data *wd = elm_widget_data_get(item->base.widget); Widget_Data *wd = elm_widget_data_get(item->base.widget);
wd->items = eina_list_remove(wd->items, item); wd->items = eina_list_remove(wd->items, item);
} }
elm_widget_item_del(item); elm_widget_item_del(item);

32
legacy/elementary/src/lib/elm_module.c
View File

@ -4,22 +4,22 @@
/* what are moodules in elementary for? for modularising behavior and features /* what are moodules in elementary for? for modularising behavior and features
* so they can be plugged in and out where you dont want the core source to * so they can be plugged in and out where you dont want the core source to
* always behave like that or do it that way. plug it at runtime! * always behave like that or do it that way. plug it at runtime!
* *
* they have module names (in config) and "slots" to plug that module into * they have module names (in config) and "slots" to plug that module into
* to server a purpose. eg you plug plugin "xx" into the "entry-copy-paste" * to server a purpose. eg you plug plugin "xx" into the "entry-copy-paste"
* slot so it would provide replacement copy & paste ui functionality and * slot so it would provide replacement copy & paste ui functionality and
* specific symbols * specific symbols
* *
* config is something like: * config is something like:
* *
* export ELM_MODULES="xx>slot1:yy>slot2" * export ELM_MODULES="xx>slot1:yy>slot2"
* *
* where a module named xx is plugged into slot1 & yy is plugged into slot2 * where a module named xx is plugged into slot1 & yy is plugged into slot2
* *
* real examples: * real examples:
* *
* export ELM_MODULES="my_module>entry/api" * export ELM_MODULES="my_module>entry/api"
* *
* this loads the module called "my_module" into the slot "entry/api" which * this loads the module called "my_module" into the slot "entry/api" which
* is an api slot for entry modules to modify behavior and hook to * is an api slot for entry modules to modify behavior and hook to
* creation/deletion of the entry as well as replace the longpress behavior. * creation/deletion of the entry as well as replace the longpress behavior.
@ -55,7 +55,7 @@ void
_elm_module_parse(const char *s) _elm_module_parse(const char *s)
{ {
const char *p, *pe; const char *p, *pe;
p = s; p = s;
pe = p; pe = p;
for (;;) for (;;)
@ -68,7 +68,7 @@ _elm_module_parse(const char *s)
if (n) if (n)
{ {
char *nn; char *nn;
strncpy(n, p, pe - p); strncpy(n, p, pe - p);
n[pe - p] = 0; n[pe - p] = 0;
nn = strchr(n, '>'); nn = strchr(n, '>');
@ -94,14 +94,14 @@ Elm_Module *
_elm_module_find_as(const char *as) _elm_module_find_as(const char *as)
{ {
Elm_Module *m; Elm_Module *m;
m = eina_hash_find(modules_as, as); m = eina_hash_find(modules_as, as);
if (!m) return NULL; if (!m) return NULL;
if (!_elm_module_load(m)) if (!_elm_module_load(m))
{ {
_elm_module_del(m); _elm_module_del(m);
return NULL; return NULL;
} }
return m; return m;
} }
@ -111,9 +111,9 @@ _elm_module_load(Elm_Module *m)
{ {
const char *home; const char *home;
char buf[PATH_MAX]; char buf[PATH_MAX];
if (m->handle) return EINA_TRUE; if (m->handle) return EINA_TRUE;
home = getenv("HOME"); home = getenv("HOME");
if (home) if (home)
{ {
@ -139,7 +139,7 @@ _elm_module_load(Elm_Module *m)
} }
} }
} }
if (!m->handle) if (!m->handle)
{ {
snprintf(buf, sizeof(buf), "%s/elementary/modules/%s/%s/module" EFL_SHARED_EXTENSION, _elm_lib_dir, m->name, MODULE_ARCH); snprintf(buf, sizeof(buf), "%s/elementary/modules/%s/%s/module" EFL_SHARED_EXTENSION, _elm_lib_dir, m->name, MODULE_ARCH);
@ -164,7 +164,7 @@ _elm_module_load(Elm_Module *m)
} }
} }
} }
if (!m->handle) return EINA_FALSE; if (!m->handle) return EINA_FALSE;
return EINA_TRUE; return EINA_TRUE;
} }

118
legacy/elementary/src/lib/elm_notify.c
View File

@ -44,9 +44,9 @@ static void _resize(void *data, Evas *e, Evas_Object *obj, void *event_info);
static const char SIG_BLOCK_CLICKED[] = "block,clicked"; static const char SIG_BLOCK_CLICKED[] = "block,clicked";
static const char SIG_TIMEOUT[] = "timeout"; static const char SIG_TIMEOUT[] = "timeout";
static const Evas_Smart_Cb_Description _signals[] = { static const Evas_Smart_Cb_Description _signals[] = {
{SIG_BLOCK_CLICKED, ""}, {SIG_BLOCK_CLICKED, ""},
{SIG_TIMEOUT, ""}, {SIG_TIMEOUT, ""},
{NULL, NULL} {NULL, NULL}
}; };
static void static void
@ -67,8 +67,8 @@ _del_hook(Evas_Object *obj)
elm_notify_repeat_events_set(obj, EINA_TRUE); elm_notify_repeat_events_set(obj, EINA_TRUE);
if (wd->timer) if (wd->timer)
{ {
ecore_timer_del(wd->timer); ecore_timer_del(wd->timer);
wd->timer = NULL; wd->timer = NULL;
} }
free(wd); free(wd);
} }
@ -129,34 +129,34 @@ _notify_theme_apply(Evas_Object *obj)
switch (wd->orient) switch (wd->orient)
{ {
case ELM_NOTIFY_ORIENT_TOP: case ELM_NOTIFY_ORIENT_TOP:
_elm_theme_object_set(obj, wd->notify, "notify", "top", style); _elm_theme_object_set(obj, wd->notify, "notify", "top", style);
break; break;
case ELM_NOTIFY_ORIENT_CENTER: case ELM_NOTIFY_ORIENT_CENTER:
_elm_theme_object_set(obj, wd->notify, "notify", "center", style); _elm_theme_object_set(obj, wd->notify, "notify", "center", style);
break; break;
case ELM_NOTIFY_ORIENT_BOTTOM: case ELM_NOTIFY_ORIENT_BOTTOM:
_elm_theme_object_set(obj, wd->notify, "notify", "bottom", style); _elm_theme_object_set(obj, wd->notify, "notify", "bottom", style);
break; break;
case ELM_NOTIFY_ORIENT_LEFT: case ELM_NOTIFY_ORIENT_LEFT:
_elm_theme_object_set(obj, wd->notify, "notify", "left", style); _elm_theme_object_set(obj, wd->notify, "notify", "left", style);
break; break;
case ELM_NOTIFY_ORIENT_RIGHT: case ELM_NOTIFY_ORIENT_RIGHT:
_elm_theme_object_set(obj, wd->notify, "notify", "right", style); _elm_theme_object_set(obj, wd->notify, "notify", "right", style);
break; break;
case ELM_NOTIFY_ORIENT_TOP_LEFT: case ELM_NOTIFY_ORIENT_TOP_LEFT:
_elm_theme_object_set(obj, wd->notify, "notify", "top_left", style); _elm_theme_object_set(obj, wd->notify, "notify", "top_left", style);
break; break;
case ELM_NOTIFY_ORIENT_TOP_RIGHT: case ELM_NOTIFY_ORIENT_TOP_RIGHT:
_elm_theme_object_set(obj, wd->notify, "notify", "top_right", style); _elm_theme_object_set(obj, wd->notify, "notify", "top_right", style);
break; break;
case ELM_NOTIFY_ORIENT_BOTTOM_LEFT: case ELM_NOTIFY_ORIENT_BOTTOM_LEFT:
_elm_theme_object_set(obj, wd->notify, "notify", "bottom_left", style); _elm_theme_object_set(obj, wd->notify, "notify", "bottom_left", style);
break; break;
case ELM_NOTIFY_ORIENT_BOTTOM_RIGHT: case ELM_NOTIFY_ORIENT_BOTTOM_RIGHT:
_elm_theme_object_set(obj, wd->notify, "notify", "bottom_right", style); _elm_theme_object_set(obj, wd->notify, "notify", "bottom_right", style);
break; break;
case ELM_NOTIFY_ORIENT_LAST: case ELM_NOTIFY_ORIENT_LAST:
break; break;
} }
} }
@ -280,11 +280,11 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
if (sub == wd->content) if (sub == wd->content)
{ {
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj); _changed_size_hints, obj);
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_RESIZE, evas_object_event_callback_del_full(sub, EVAS_CALLBACK_RESIZE,
_content_resize, obj); _content_resize, obj);
wd->content = NULL; wd->content = NULL;
} }
} }
@ -325,7 +325,7 @@ _calc(Evas_Object *obj)
_notify_move_to_orientation(obj); _notify_move_to_orientation(obj);
evas_object_resize(wd->notify, minw, minh); evas_object_resize(wd->notify, minw, minh);
} }
_sizing_eval(obj); _sizing_eval(obj);
} }
static Eina_Bool static Eina_Bool
@ -345,8 +345,8 @@ _timer_init(Evas_Object *obj, Widget_Data *wd)
{ {
if (wd->timer) if (wd->timer)
{ {
ecore_timer_del(wd->timer); ecore_timer_del(wd->timer);
wd->timer = NULL; wd->timer = NULL;
} }
if ((evas_object_visible_get(obj)) && (wd->timeout > 0.0)) if ((evas_object_visible_get(obj)) && (wd->timeout > 0.0))
wd->timer = ecore_timer_add(wd->timeout, _timer_cb, obj); wd->timer = ecore_timer_add(wd->timeout, _timer_cb, obj);
@ -374,8 +374,8 @@ _hide(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_i
evas_object_hide(wd->block_events); evas_object_hide(wd->block_events);
if (wd->timer) if (wd->timer)
{ {
ecore_timer_del(wd->timer); ecore_timer_del(wd->timer);
wd->timer = NULL; wd->timer = NULL;
} }
} }
@ -428,7 +428,7 @@ elm_notify_add(Evas_Object *parent)
Widget_Data *wd; Widget_Data *wd;
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
ELM_SET_WIDTYPE(widtype, "notify"); ELM_SET_WIDTYPE(widtype, "notify");
elm_widget_type_set(obj, "notify"); elm_widget_type_set(obj, "notify");
elm_widget_sub_object_add(parent, obj); elm_widget_sub_object_add(parent, obj);
@ -484,12 +484,12 @@ elm_notify_content_set(Evas_Object *obj, Evas_Object *content)
if (content) if (content)
{ {
elm_widget_sub_object_add(obj, content); elm_widget_sub_object_add(obj, content);
evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS, evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj); _changed_size_hints, obj);
evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE, evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE,
_content_resize, obj); _content_resize, obj);
edje_object_part_swallow(wd->notify, "elm.swallow.content", content); edje_object_part_swallow(wd->notify, "elm.swallow.content", content);
} }
_sizing_eval(obj); _sizing_eval(obj);
_calc(obj); _calc(obj);
@ -557,36 +557,36 @@ elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent)
if (!wd) return; if (!wd) return;
if (wd->parent) if (wd->parent)
{ {
evas_object_event_callback_del_full(wd->parent, evas_object_event_callback_del_full(wd->parent,
EVAS_CALLBACK_CHANGED_SIZE_HINTS, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj); _changed_size_hints, obj);
evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE, evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE,
_changed_size_hints, obj); _changed_size_hints, obj);
evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_MOVE, evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_MOVE,
_changed_size_hints, obj); _changed_size_hints, obj);
evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL, evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL,
_parent_del, obj); _parent_del, obj);
evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_HIDE, evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_HIDE,
_parent_hide, obj); _parent_hide, obj);
wd->parent = NULL; wd->parent = NULL;
} }
if (parent) if (parent)
{ {
wd->parent = parent; wd->parent = parent;
evas_object_event_callback_add(parent, evas_object_event_callback_add(parent,
EVAS_CALLBACK_CHANGED_SIZE_HINTS, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj); _changed_size_hints, obj);
evas_object_event_callback_add(parent, EVAS_CALLBACK_RESIZE, evas_object_event_callback_add(parent, EVAS_CALLBACK_RESIZE,
_changed_size_hints, obj); _changed_size_hints, obj);
evas_object_event_callback_add(parent, EVAS_CALLBACK_MOVE, evas_object_event_callback_add(parent, EVAS_CALLBACK_MOVE,
_changed_size_hints, obj); _changed_size_hints, obj);
evas_object_event_callback_add(parent, EVAS_CALLBACK_DEL, evas_object_event_callback_add(parent, EVAS_CALLBACK_DEL,
_parent_del, obj); _parent_del, obj);
evas_object_event_callback_add(parent, EVAS_CALLBACK_HIDE, evas_object_event_callback_add(parent, EVAS_CALLBACK_HIDE,
_parent_hide, obj); _parent_hide, obj);
edje_object_part_swallow(wd->notify, "elm.swallow.parent", parent); edje_object_part_swallow(wd->notify, "elm.swallow.parent", parent);
_sizing_eval(obj); _sizing_eval(obj);
} }
_calc(obj); _calc(obj);
} }
@ -703,10 +703,10 @@ elm_notify_repeat_events_set(Evas_Object *obj, Eina_Bool repeat)
wd->repeat_events = repeat; wd->repeat_events = repeat;
if (!repeat) if (!repeat)
{ {
wd->block_events = edje_object_add(evas_object_evas_get(obj)); wd->block_events = edje_object_add(evas_object_evas_get(obj));
_block_events_theme_apply(obj); _block_events_theme_apply(obj);
elm_widget_resize_object_set(obj, wd->block_events); elm_widget_resize_object_set(obj, wd->block_events);
edje_object_signal_callback_add(wd->block_events, "elm,action,clicked", edje_object_signal_callback_add(wd->block_events, "elm,action,clicked",
"elm", _signal_block_clicked, obj); "elm", _signal_block_clicked, obj);
} }
else else

144
legacy/elementary/src/lib/elm_pager.c
View File

@ -61,7 +61,7 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
Item *it; Item *it;
if (!wd) return; if (!wd) return;
EINA_LIST_FOREACH(wd->stack, l, it) EINA_LIST_FOREACH(wd->stack, l, it)
edje_object_mirrored_set(it->base, rtl); edje_object_mirrored_set(it->base, rtl);
} }
static void static void
@ -108,8 +108,8 @@ _sizing_eval(Evas_Object *obj)
if (!wd) return; if (!wd) return;
EINA_LIST_FOREACH(wd->stack, l, it) EINA_LIST_FOREACH(wd->stack, l, it)
{ {
if (it->minw > minw) minw = it->minw; if (it->minw > minw) minw = it->minw;
if (it->minh > minh) minh = it->minh; if (it->minh > minh) minh = it->minh;
} }
evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_min_set(obj, minw, minh);
evas_object_size_hint_max_set(obj, -1, -1); evas_object_size_hint_max_set(obj, -1, -1);
@ -138,27 +138,27 @@ _eval_top(Evas_Object *obj)
ittop = eina_list_last(wd->stack)->data; ittop = eina_list_last(wd->stack)->data;
if (ittop != wd->top) if (ittop != wd->top)
{ {
Evas_Object *o; Evas_Object *o;
const char *onshow, *onhide; const char *onshow, *onhide;
if (wd->top) if (wd->top)
{ {
o = wd->top->base; o = wd->top->base;
if (wd->top->popme) if (wd->top->popme)
edje_object_signal_emit(o, "elm,action,pop", "elm"); edje_object_signal_emit(o, "elm,action,pop", "elm");
else else
edje_object_signal_emit(o, "elm,action,hide", "elm"); edje_object_signal_emit(o, "elm,action,hide", "elm");
onhide = edje_object_data_get(o, "onhide"); onhide = edje_object_data_get(o, "onhide");
if (onhide) if (onhide)
{ {
if (!strcmp(onhide, "raise")) evas_object_raise(o); if (!strcmp(onhide, "raise")) evas_object_raise(o);
else if (!strcmp(onhide, "lower")) evas_object_lower(o); else if (!strcmp(onhide, "lower")) evas_object_lower(o);
} }
} }
wd->oldtop = wd->top; wd->oldtop = wd->top;
wd->top = ittop; wd->top = ittop;
o = wd->top->base; o = wd->top->base;
evas_object_show(o); evas_object_show(o);
if (wd->oldtop) if (wd->oldtop)
{ {
if (elm_object_focus_get(wd->oldtop->content)) if (elm_object_focus_get(wd->oldtop->content))
@ -170,12 +170,12 @@ _eval_top(Evas_Object *obj)
} }
else else
edje_object_signal_emit(o, "elm,action,push", "elm"); edje_object_signal_emit(o, "elm,action,push", "elm");
onshow = edje_object_data_get(o, "onshow"); onshow = edje_object_data_get(o, "onshow");
if (onshow) if (onshow)
{ {
if (!strcmp(onshow, "raise")) evas_object_raise(o); if (!strcmp(onshow, "raise")) evas_object_raise(o);
else if (!strcmp(onshow, "lower")) evas_object_lower(o); else if (!strcmp(onshow, "lower")) evas_object_lower(o);
} }
} }
} }
@ -189,7 +189,7 @@ _move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSE
if (!wd) return; if (!wd) return;
evas_object_geometry_get(obj, &x, &y, NULL, NULL); evas_object_geometry_get(obj, &x, &y, NULL, NULL);
EINA_LIST_FOREACH(wd->stack, l, it) EINA_LIST_FOREACH(wd->stack, l, it)
evas_object_move(it->base, x, y); evas_object_move(it->base, x, y);
} }
static void static void
@ -202,22 +202,22 @@ _sub_del(void *data, Evas_Object *obj __UNUSED__, void *event_info)
if (!wd) return; if (!wd) return;
EINA_LIST_FOREACH(wd->stack, l, it) EINA_LIST_FOREACH(wd->stack, l, it)
{ {
if (it->content == sub) if (it->content == sub)
{ {
wd->stack = eina_list_remove_list(wd->stack, l); wd->stack = eina_list_remove_list(wd->stack, l);
evas_object_event_callback_del_full evas_object_event_callback_del_full
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, it); (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, it);
evas_object_del(it->base); evas_object_del(it->base);
_eval_top(it->obj); _eval_top(it->obj);
free(it); free(it);
return; return;
} }
} }
} }
static void static void
_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) _resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
Evas_Coord w, h; Evas_Coord w, h;
Eina_List *l; Eina_List *l;
@ -257,7 +257,7 @@ elm_pager_add(Evas_Object *parent)
Widget_Data *wd; Widget_Data *wd;
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
ELM_SET_WIDTYPE(widtype, "pager"); ELM_SET_WIDTYPE(widtype, "pager");
elm_widget_type_set(obj, "pager"); elm_widget_type_set(obj, "pager");
elm_widget_sub_object_add(parent, obj); elm_widget_sub_object_add(parent, obj);
@ -273,7 +273,7 @@ elm_pager_add(Evas_Object *parent)
wd->rect = evas_object_rectangle_add(e); wd->rect = evas_object_rectangle_add(e);
elm_widget_sub_object_add(obj, wd->rect); elm_widget_sub_object_add(obj, wd->rect);
evas_object_color_set(wd->rect, 255, 255, 255, 0); evas_object_color_set(wd->rect, 255, 255, 255, 0);
evas_object_clip_set(wd->rect, wd->clip); evas_object_clip_set(wd->rect, wd->clip);
evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, obj); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, obj);
@ -317,7 +317,7 @@ elm_pager_content_push(Evas_Object *obj, Evas_Object *content)
elm_widget_sub_object_add(obj, it->base); elm_widget_sub_object_add(obj, it->base);
elm_widget_sub_object_add(obj, it->content); elm_widget_sub_object_add(obj, it->content);
_elm_theme_object_set(obj, it->base, "pager", "base", elm_widget_style_get(obj)); _elm_theme_object_set(obj, it->base, "pager", "base", elm_widget_style_get(obj));
edje_object_signal_callback_add(it->base, "elm,action,hide,finished", "", edje_object_signal_callback_add(it->base, "elm,action,hide,finished", "",
_signal_hide_finished, it); _signal_hide_finished, it);
evas_object_event_callback_add(it->content, evas_object_event_callback_add(it->content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
@ -356,28 +356,28 @@ elm_pager_content_pop(Evas_Object *obj)
ll = eina_list_last(wd->stack); ll = eina_list_last(wd->stack);
if (ll) if (ll)
{ {
ll = ll->prev; ll = ll->prev;
if (!ll) if (!ll)
{ {
Evas_Object *o; Evas_Object *o;
const char *onhide; const char *onhide;
wd->top = it; wd->top = it;
o = wd->top->base; o = wd->top->base;
edje_object_signal_emit(o, "elm,action,pop", "elm"); edje_object_signal_emit(o, "elm,action,pop", "elm");
onhide = edje_object_data_get(o, "onhide"); onhide = edje_object_data_get(o, "onhide");
if (onhide) if (onhide)
{ {
if (!strcmp(onhide, "raise")) evas_object_raise(o); if (!strcmp(onhide, "raise")) evas_object_raise(o);
else if (!strcmp(onhide, "lower")) evas_object_lower(o); else if (!strcmp(onhide, "lower")) evas_object_lower(o);
} }
wd->top = NULL; wd->top = NULL;
} }
else else
{ {
it = ll->data; it = ll->data;
elm_pager_content_promote(obj, it->content); elm_pager_content_promote(obj, it->content);
} }
} }
} }
@ -403,13 +403,13 @@ elm_pager_content_promote(Evas_Object *obj, Evas_Object *content)
if (!wd) return; if (!wd) return;
EINA_LIST_FOREACH(wd->stack, l, it) EINA_LIST_FOREACH(wd->stack, l, it)
{ {
if (it->content == content) if (it->content == content)
{ {
wd->stack = eina_list_remove_list(wd->stack, l); wd->stack = eina_list_remove_list(wd->stack, l);
wd->stack = eina_list_append(wd->stack, it); wd->stack = eina_list_append(wd->stack, it);
_eval_top(obj); _eval_top(obj);
return; return;
} }
} }
} }

100
legacy/elementary/src/lib/elm_panel.c
View File

@ -18,7 +18,7 @@
*/ */
typedef struct _Widget_Data Widget_Data; typedef struct _Widget_Data Widget_Data;
struct _Widget_Data struct _Widget_Data
{ {
Evas_Object *scr, *bx, *content; Evas_Object *scr, *bx, *content;
Elm_Panel_Orient orient; Elm_Panel_Orient orient;
@ -34,8 +34,8 @@ static void _resize(void *data, Evas *evas, Evas_Object *obj, void *event);
static void _layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data); static void _layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
static void _toggle_panel(void *data, Evas_Object *obj, const char *emission, const char *source); static void _toggle_panel(void *data, Evas_Object *obj, const char *emission, const char *source);
static void static void
_del_hook(Evas_Object *obj) _del_hook(Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
@ -55,8 +55,8 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
} }
} }
static void static void
_theme_hook(Evas_Object *obj) _theme_hook(Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
@ -106,7 +106,7 @@ _elm_panel_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas
/* Try Focus cycle in subitem */ /* Try Focus cycle in subitem */
if (!wd->hidden) if (!wd->hidden)
return elm_widget_focus_next_get(cur, dir, next); return elm_widget_focus_next_get(cur, dir, next);
/* Return */ /* Return */
*next = (Evas_Object *)obj; *next = (Evas_Object *)obj;
@ -119,7 +119,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
emission, source); emission, source);
} }
static void static void
@ -128,7 +128,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
edje_object_signal_callback_add(elm_smart_scroller_edje_object_get(wd->scr), edje_object_signal_callback_add(elm_smart_scroller_edje_object_get(wd->scr),
emission, source, func_cb, data); emission, source, func_cb, data);
} }
static void static void
@ -136,12 +136,12 @@ _signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *so
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
edje_object_signal_callback_del_full( edje_object_signal_callback_del_full(
elm_smart_scroller_edje_object_get(wd->scr), emission, source, elm_smart_scroller_edje_object_get(wd->scr), emission, source,
func_cb, data); func_cb, data);
} }
static void static void
_sizing_eval(Evas_Object *obj) _sizing_eval(Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
Evas_Coord mw = -1, mh = -1; Evas_Coord mw = -1, mh = -1;
@ -149,7 +149,7 @@ _sizing_eval(Evas_Object *obj)
Evas_Coord w, h; Evas_Coord w, h;
if (!wd) return; if (!wd) return;
evas_object_smart_calculate(wd->bx); evas_object_smart_calculate(wd->bx);
edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr),
&mw, &mh); &mw, &mh);
evas_object_geometry_get(obj, NULL, NULL, &w, &h); evas_object_geometry_get(obj, NULL, NULL, &w, &h);
if (w < mw) w = mw; if (w < mw) w = mw;
@ -168,7 +168,7 @@ _sizing_eval(Evas_Object *obj)
evas_object_size_hint_max_set(obj, -1, -1); evas_object_size_hint_max_set(obj, -1, -1);
} }
static void static void
_resize(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) _resize(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
@ -183,29 +183,29 @@ _resize(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
} }
} }
static void static void
_layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data) _layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data)
{ {
Widget_Data *wd = data; Widget_Data *wd = data;
if (!wd) return; if (!wd) return;
_els_box_layout(o, priv, EINA_TRUE, EINA_FALSE, EINA_FALSE); _els_box_layout(o, priv, EINA_TRUE, EINA_FALSE, EINA_FALSE);
} }
static void static void
_toggle_panel(void *data, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__) _toggle_panel(void *data, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
if (!wd) return; if (!wd) return;
if (wd->hidden) if (wd->hidden)
{ {
edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
"elm,action,show", "elm"); "elm,action,show", "elm");
wd->hidden = EINA_FALSE; wd->hidden = EINA_FALSE;
evas_object_repeat_events_set(obj, EINA_FALSE); evas_object_repeat_events_set(obj, EINA_FALSE);
} }
else else
{ {
edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr), edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
"elm,action,hide", "elm"); "elm,action,hide", "elm");
wd->hidden = EINA_TRUE; wd->hidden = EINA_TRUE;
evas_object_repeat_events_set(obj, EINA_TRUE); evas_object_repeat_events_set(obj, EINA_TRUE);
@ -249,14 +249,14 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
* @ingroup Panel * @ingroup Panel
*/ */
EAPI Evas_Object * EAPI Evas_Object *
elm_panel_add(Evas_Object *parent) elm_panel_add(Evas_Object *parent)
{ {
Evas_Object *obj; Evas_Object *obj;
Evas *e; Evas *e;
Widget_Data *wd; Widget_Data *wd;
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
ELM_SET_WIDTYPE(widtype, "panel"); ELM_SET_WIDTYPE(widtype, "panel");
elm_widget_type_set(obj, "panel"); elm_widget_type_set(obj, "panel");
elm_widget_sub_object_add(parent, obj); elm_widget_sub_object_add(parent, obj);
@ -276,7 +276,7 @@ elm_panel_add(Evas_Object *parent)
_theme_hook(obj); _theme_hook(obj);
elm_smart_scroller_bounce_allow_set(wd->scr, EINA_FALSE, EINA_FALSE); elm_smart_scroller_bounce_allow_set(wd->scr, EINA_FALSE, EINA_FALSE);
elm_widget_resize_object_set(obj, wd->scr); elm_widget_resize_object_set(obj, wd->scr);
elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF, elm_smart_scroller_policy_set(wd->scr, ELM_SMART_SCROLLER_POLICY_OFF,
ELM_SMART_SCROLLER_POLICY_OFF); ELM_SMART_SCROLLER_POLICY_OFF);
wd->hidden = EINA_FALSE; wd->hidden = EINA_FALSE;
@ -289,8 +289,8 @@ elm_panel_add(Evas_Object *parent)
elm_smart_scroller_child_set(wd->scr, wd->bx); elm_smart_scroller_child_set(wd->scr, wd->bx);
evas_object_show(wd->bx); evas_object_show(wd->bx);
edje_object_signal_callback_add(elm_smart_scroller_edje_object_get(wd->scr), edje_object_signal_callback_add(elm_smart_scroller_edje_object_get(wd->scr),
"elm,action,panel,toggle", "*", "elm,action,panel,toggle", "*",
_toggle_panel, obj); _toggle_panel, obj);
evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_RESIZE, _resize, obj); evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_RESIZE, _resize, obj);
@ -314,33 +314,33 @@ elm_panel_add(Evas_Object *parent)
* *
* @ingroup Panel * @ingroup Panel
*/ */
EAPI void EAPI void
elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient) elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient)
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
wd->orient = orient; wd->orient = orient;
switch (orient) switch (orient)
{ {
case ELM_PANEL_ORIENT_TOP: case ELM_PANEL_ORIENT_TOP:
elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "top"); elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "top");
break; break;
case ELM_PANEL_ORIENT_BOTTOM: case ELM_PANEL_ORIENT_BOTTOM:
elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "bottom"); elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "bottom");
break; break;
case ELM_PANEL_ORIENT_LEFT: case ELM_PANEL_ORIENT_LEFT:
if (!elm_widget_mirrored_get(obj)) if (!elm_widget_mirrored_get(obj))
elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "left"); elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "left");
else else
elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "right"); elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "right");
break; break;
case ELM_PANEL_ORIENT_RIGHT: case ELM_PANEL_ORIENT_RIGHT:
if (!elm_widget_mirrored_get(obj)) if (!elm_widget_mirrored_get(obj))
elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "right"); elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "right");
else else
elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "left"); elm_smart_scroller_object_theme_set(obj, wd->scr, "panel", "base", "left");
break; break;
} }
_sizing_eval(obj); _sizing_eval(obj);
@ -360,7 +360,7 @@ elm_panel_orient_get(const Evas_Object *obj)
ELM_CHECK_WIDTYPE(obj, widtype) ELM_PANEL_ORIENT_LEFT; ELM_CHECK_WIDTYPE(obj, widtype) ELM_PANEL_ORIENT_LEFT;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return ELM_PANEL_ORIENT_LEFT; if (!wd) return ELM_PANEL_ORIENT_LEFT;
return wd->orient; return wd->orient;
} }
/** /**
@ -387,8 +387,8 @@ elm_panel_content_set(Evas_Object *obj, Evas_Object *content)
wd->content = content; wd->content = content;
if (content) if (content)
{ {
evas_object_box_append(wd->bx, wd->content); evas_object_box_append(wd->bx, wd->content);
evas_object_show(wd->content); evas_object_show(wd->content);
} }
_sizing_eval(obj); _sizing_eval(obj);
} }

68
legacy/elementary/src/lib/elm_panes.c
View File

@ -14,15 +14,15 @@ struct _Widget_Data
struct struct
{ {
Evas_Object *left; Evas_Object *left;
Evas_Object *right; Evas_Object *right;
} contents; } contents;
struct struct
{ {
int x_diff; int x_diff;
int y_diff; int y_diff;
Eina_Bool move; Eina_Bool move;
} move; } move;
Eina_Bool clicked_double; Eina_Bool clicked_double;
@ -63,7 +63,7 @@ _theme_hook(Evas_Object *obj)
_elm_widget_mirrored_reload(obj); _elm_widget_mirrored_reload(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj)); _mirrored_set(obj, elm_widget_mirrored_get(obj));
size = elm_panes_content_left_size_get(obj); size = elm_panes_content_left_size_get(obj);
if (wd->horizontal) if (wd->horizontal)
_elm_theme_object_set(obj, wd->panes, "panes", "horizontal", style); _elm_theme_object_set(obj, wd->panes, "panes", "horizontal", style);
else else
@ -148,17 +148,17 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
if (!wd) return; if (!wd) return;
if (sub == wd->contents.left) if (sub == wd->contents.left)
{ {
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj); _changed_size_hints, obj);
wd->contents.left = NULL; wd->contents.left = NULL;
_sizing_eval(obj); _sizing_eval(obj);
} }
else if (sub == wd->contents.right) else if (sub == wd->contents.right)
{ {
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj); _changed_size_hints, obj);
wd->contents.right= NULL; wd->contents.right= NULL;
_sizing_eval(obj); _sizing_eval(obj);
} }
} }
@ -190,8 +190,8 @@ _unpress(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED
if (wd->clicked_double) if (wd->clicked_double)
{ {
evas_object_smart_callback_call(data, "clicked,double", NULL); evas_object_smart_callback_call(data, "clicked,double", NULL);
wd->clicked_double = EINA_FALSE; wd->clicked_double = EINA_FALSE;
} }
} }
@ -211,7 +211,7 @@ elm_panes_add(Evas_Object *parent)
Widget_Data *wd; Widget_Data *wd;
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
ELM_SET_WIDTYPE(widtype, "panes"); ELM_SET_WIDTYPE(widtype, "panes");
elm_widget_type_set(obj, "panes"); elm_widget_type_set(obj, "panes");
elm_widget_sub_object_add(parent, obj); elm_widget_sub_object_add(parent, obj);
@ -228,17 +228,17 @@ elm_panes_add(Evas_Object *parent)
elm_panes_content_left_size_set(obj, 0.5); elm_panes_content_left_size_set(obj, 0.5);
edje_object_signal_callback_add(wd->panes, "elm,action,click", "", edje_object_signal_callback_add(wd->panes, "elm,action,click", "",
_clicked, obj); _clicked, obj);
edje_object_signal_callback_add(wd->panes, "elm,action,click,double", "", edje_object_signal_callback_add(wd->panes, "elm,action,click,double", "",
_clicked_double, obj); _clicked_double, obj);
edje_object_signal_callback_add(wd->panes, "elm,action,press", "", edje_object_signal_callback_add(wd->panes, "elm,action,press", "",
_press, obj); _press, obj);
edje_object_signal_callback_add(wd->panes, "elm,action,unpress", "", edje_object_signal_callback_add(wd->panes, "elm,action,unpress", "",
_unpress, obj); _unpress, obj);
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj); _changed_size_hints, obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj)); _mirrored_set(obj, elm_widget_mirrored_get(obj));
@ -266,14 +266,14 @@ elm_panes_content_left_set(Evas_Object *obj, Evas_Object *content)
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (wd->contents.left) if (wd->contents.left)
{ {
evas_object_del(wd->contents.left); evas_object_del(wd->contents.left);
wd->contents.left = NULL; wd->contents.left = NULL;
} }
if (content) if (content)
{ {
wd->contents.left = content; wd->contents.left = content;
elm_widget_sub_object_add(obj, content); elm_widget_sub_object_add(obj, content);
edje_object_part_swallow(wd->panes, "elm.swallow.left", content); edje_object_part_swallow(wd->panes, "elm.swallow.left", content);
} }
} }
@ -296,14 +296,14 @@ elm_panes_content_right_set(Evas_Object *obj, Evas_Object *content)
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (wd->contents.right) if (wd->contents.right)
{ {
evas_object_del(wd->contents.right); evas_object_del(wd->contents.right);
wd->contents.right = NULL; wd->contents.right = NULL;
} }
if (content) if (content)
{ {
wd->contents.right = content; wd->contents.right = content;
elm_widget_sub_object_add(obj, content); elm_widget_sub_object_add(obj, content);
edje_object_part_swallow(wd->panes, "elm.swallow.right", content); edje_object_part_swallow(wd->panes, "elm.swallow.right", content);
} }
} }
@ -391,7 +391,7 @@ elm_panes_content_right_unset(Evas_Object *obj)
return content; return content;
} }
EAPI double EAPI double
elm_panes_content_left_size_get(const Evas_Object *obj) elm_panes_content_left_size_get(const Evas_Object *obj)
{ {
ELM_CHECK_WIDTYPE(obj, widtype) 0.0; ELM_CHECK_WIDTYPE(obj, widtype) 0.0;
@ -403,7 +403,7 @@ elm_panes_content_left_size_get(const Evas_Object *obj)
else return w; else return w;
} }
EAPI void EAPI void
elm_panes_content_left_size_set(Evas_Object *obj, double size) elm_panes_content_left_size_set(Evas_Object *obj, double size)
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype);
@ -417,7 +417,7 @@ elm_panes_content_left_size_set(Evas_Object *obj, double size)
edje_object_part_drag_value_set(wd->panes, "elm.bar", size, 0.0); edje_object_part_drag_value_set(wd->panes, "elm.bar", size, 0.0);
} }
EAPI void EAPI void
elm_panes_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) elm_panes_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype);
@ -428,7 +428,7 @@ elm_panes_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
elm_panes_content_left_size_set(obj, 0.5); elm_panes_content_left_size_set(obj, 0.5);
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_panes_horizontal_get(const Evas_Object *obj) elm_panes_horizontal_get(const Evas_Object *obj)
{ {
ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;