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

elementary / slider, radio, separator, photocam, photo, store, scroller, slideshow, spinner, progressbar - removed white spacesw 

SVN revision: 58250
This commit is contained in:
ChunEon Park 2011-04-01 11:24:15 +00:00
parent 22588576be
commit 711b428aae
10 changed files with 907 additions and 907 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/elementary/src/lib/elm_photo.c
View File

@ -241,9 +241,9 @@ elm_photo_add(Evas_Object *parent)
_els_smart_icon_scale_set(wd->img,
elm_widget_scale_get(obj) * _elm_config->scale);
evas_object_event_callback_add(wd->img, EVAS_CALLBACK_MOUSE_UP,
_mouse_up, obj);
_mouse_up, obj);
evas_object_event_callback_add(wd->img, EVAS_CALLBACK_MOUSE_DOWN,
_mouse_down, obj);
_mouse_down, obj);
evas_object_repeat_events_set(wd->img, 1);
edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->img);
evas_object_show(wd->img);
@ -253,9 +253,9 @@ elm_photo_add(Evas_Object *parent)
icon = _els_smart_icon_object_get(wd->img);
evas_object_event_callback_add(icon, EVAS_CALLBACK_MOVE,
_icon_move_resize, obj);
_icon_move_resize, obj);
evas_object_event_callback_add(icon, EVAS_CALLBACK_RESIZE,
_icon_move_resize, obj);
_icon_move_resize, obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_sizing_eval(obj);

94
legacy/elementary/src/lib/elm_photocam.c
View File

@ -115,8 +115,8 @@ struct _Widget_Data
} size;
struct
{
Eina_Bool show : 1;
Evas_Coord x, y ,w ,h;
Eina_Bool show : 1;
Evas_Coord x, y ,w ,h;
} show;
int tsize;
Evas_Object *img; // low res version of image (scale down == 8)
@ -179,8 +179,8 @@ img_place(Evas_Object *obj, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Co
if (wd->show.show)
{
wd->show.show = EINA_FALSE;
elm_smart_scroller_child_region_show(wd->scr, wd->show.x, wd->show.y, wd->show.w, wd->show.h);
wd->show.show = EINA_FALSE;
elm_smart_scroller_child_region_show(wd->scr, wd->show.x, wd->show.y, wd->show.w, wd->show.h);
}
}
@ -341,9 +341,9 @@ grid_create(Evas_Object *obj)
g->grid[tn].wd = wd;
g->grid[tn].img =
evas_object_image_add(evas_object_evas_get(obj));
evas_object_image_add(evas_object_evas_get(obj));
evas_object_image_scale_hint_set
(g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_DYNAMIC);
(g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_DYNAMIC);
evas_object_pass_events_set(g->grid[tn].img, EINA_TRUE);
evas_object_smart_member_add(g->grid[tn].img,
wd->pan_smart);
@ -626,7 +626,7 @@ static void
_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
// Evas_Event_Mouse_Move *ev = event_info;
// Evas_Event_Mouse_Move *ev = event_info;
if (!wd) return;
}
@ -708,13 +708,13 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
if (!wd) return;
if (elm_widget_focus_get(obj))
{
edje_object_signal_emit(wd->obj, "elm,action,focus", "elm");
evas_object_focus_set(wd->obj, EINA_TRUE);
edje_object_signal_emit(wd->obj, "elm,action,focus", "elm");
evas_object_focus_set(wd->obj, EINA_TRUE);
}
else
{
edje_object_signal_emit(wd->obj, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->obj, EINA_FALSE);
edje_object_signal_emit(wd->obj, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->obj, EINA_FALSE);
}
}
@ -724,21 +724,21 @@ _theme_hook(Evas_Object *obj)
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
elm_smart_scroller_object_theme_set(obj, wd->scr, "photocam", "base", 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);
_sizing_eval(obj);
}
/*
static void
_show_region_hook(void *data, Evas_Object *obj)
{
static void
_show_region_hook(void *data, Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(data);
Evas_Coord x, y, w, h;
if (!wd) return;
elm_widget_show_region_get(obj, &x, &y, &w, &h);
elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
}
*/
}
*/
static void
_sizing_eval(Evas_Object *obj)
@ -746,11 +746,11 @@ _sizing_eval(Evas_Object *obj)
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
if (!wd) return;
// evas_object_size_hint_min_get(wd->scr, &minw, &minh);
// evas_object_size_hint_min_get(wd->scr, &minw, &minh);
evas_object_size_hint_max_get(wd->scr, &maxw, &maxh);
// minw = -1;
// minh = -1;
// if (wd->mode != ELM_LIST_LIMIT) minw = -1;
// minw = -1;
// minh = -1;
// if (wd->mode != ELM_LIST_LIMIT) minw = -1;
evas_object_size_hint_min_set(obj, minw, minh);
evas_object_size_hint_max_set(obj, maxw, maxh);
}
@ -961,7 +961,7 @@ _scr_scroll(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__
static Eina_Bool
_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__,
Evas_Callback_Type type, void *event_info)
Evas_Callback_Type type, void *event_info)
{
double zoom;
if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
@ -1008,17 +1008,17 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__,
(!strcmp(ev->keyname, "KP_Prior")))
{
if (page_y < 0)
y -= -(page_y * v_h) / 100;
y -= -(page_y * v_h) / 100;
else
y -= page_y;
y -= page_y;
}
else if ((!strcmp(ev->keyname, "Next")) ||
(!strcmp(ev->keyname, "KP_Next")))
{
if (page_y < 0)
y += -(page_y * v_h) / 100;
y += -(page_y * v_h) / 100;
else
y += page_y;
y += page_y;
}
else if ((!strcmp(ev->keyname, "KP_Add")))
{
@ -1098,28 +1098,28 @@ elm_photocam_add(Evas_Object *parent)
if (!smart)
{
static Evas_Smart_Class sc;
static Evas_Smart_Class sc;
evas_object_smart_clipped_smart_set(&_pan_sc);
sc = _pan_sc;
sc.name = "elm_photocam_pan";
sc.version = EVAS_SMART_CLASS_VERSION;
sc.add = _pan_add;
sc.del = _pan_del;
sc.resize = _pan_resize;
sc.move = _pan_move;
sc.calculate = _pan_calculate;
smart = evas_smart_class_new(&sc);
evas_object_smart_clipped_smart_set(&_pan_sc);
sc = _pan_sc;
sc.name = "elm_photocam_pan";
sc.version = EVAS_SMART_CLASS_VERSION;
sc.add = _pan_add;
sc.del = _pan_del;
sc.resize = _pan_resize;
sc.move = _pan_move;
sc.calculate = _pan_calculate;
smart = evas_smart_class_new(&sc);
}
if (smart)
{
wd->pan_smart = evas_object_smart_add(e, smart);
wd->pan = evas_object_smart_data_get(wd->pan_smart);
wd->pan->wd = wd;
wd->pan_smart = evas_object_smart_add(e, smart);
wd->pan = evas_object_smart_data_get(wd->pan_smart);
wd->pan->wd = wd;
}
elm_smart_scroller_extern_pan_set(wd->scr, wd->pan_smart,
_pan_set, _pan_get, _pan_max_get,
_pan_set, _pan_get, _pan_max_get,
_pan_min_get, _pan_child_size_get);
wd->zoom = 1;
@ -1379,7 +1379,7 @@ elm_photocam_zoom_set(Evas_Object *obj, double zoom)
free(g);
}
}
done:
done:
wd->t_start = ecore_loop_time_get();
wd->t_end = wd->t_start + _elm_config->zoom_friction;
if ((wd->size.w > 0) && (wd->size.h > 0))
@ -1561,8 +1561,8 @@ elm_photocam_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h)
}
else
{
if (x) *x = 0;
if (w) *w = 0;
if (x) *x = 0;
if (w) *w = 0;
}
if (wd->size.h > 0)
@ -1582,8 +1582,8 @@ elm_photocam_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h)
}
else
{
if (y) *y = 0;
if (h) *h = 0;
if (y) *y = 0;
if (h) *h = 0;
}
}
@ -1664,7 +1664,7 @@ elm_photocam_image_region_bring_in(Evas_Object *obj, int x, int y, int w, int h
wd->zoom_animator = NULL;
zoom_do(obj, 1.0);
evas_object_smart_callback_call(obj, "zoom,stop", NULL);
}
}
elm_smart_scroller_region_bring_in(wd->scr, rx, ry, rw, rh);
}

58
legacy/elementary/src/lib/elm_progressbar.c
View File

@ -85,8 +85,8 @@ _theme_hook(Evas_Object *obj)
if (wd->icon)
{
edje_object_part_swallow(wd->progressbar, "elm.swallow.content", wd->icon);
edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm");
edje_object_part_swallow(wd->progressbar, "elm.swallow.content", wd->icon);
edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm");
}
if (wd->label)
{
@ -94,14 +94,14 @@ _theme_hook(Evas_Object *obj)
edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm");
}
if (wd->pulse)
edje_object_signal_emit(wd->progressbar, "elm,state,pulse", "elm");
edje_object_signal_emit(wd->progressbar, "elm,state,pulse", "elm");
else
edje_object_signal_emit(wd->progressbar, "elm,state,fraction", "elm");
edje_object_signal_emit(wd->progressbar, "elm,state,fraction", "elm");
if (wd->pulse_state)
edje_object_signal_emit(wd->progressbar, "elm,state,pulse,start", "elm");
edje_object_signal_emit(wd->progressbar, "elm,state,pulse,start", "elm");
if ((wd->units) && (!wd->pulse))
edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm");
edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm");
if (wd->horizontal)
evas_object_size_hint_min_set(wd->spacer, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale, 1);
@ -111,7 +111,7 @@ _theme_hook(Evas_Object *obj)
edje_object_part_swallow(wd->progressbar, "elm.swallow.bar", wd->spacer);
if (wd->inverted)
edje_object_signal_emit(wd->progressbar, "elm,state,inverted,on", "elm");
edje_object_signal_emit(wd->progressbar, "elm,state,inverted,on", "elm");
_units_set(obj);
edje_object_message_signal_process(wd->progressbar);
@ -148,12 +148,12 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
if (!wd) return;
if (sub == wd->icon)
{
edje_object_signal_emit(wd->progressbar, "elm,state,icon,hidden", "elm");
evas_object_event_callback_del_full
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
wd->icon = NULL;
edje_object_message_signal_process(wd->progressbar);
_sizing_eval(obj);
edje_object_signal_emit(wd->progressbar, "elm,state,icon,hidden", "elm");
evas_object_event_callback_del_full
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
wd->icon = NULL;
edje_object_message_signal_process(wd->progressbar);
_sizing_eval(obj);
}
}
@ -167,8 +167,8 @@ _val_set(Evas_Object *obj)
pos = wd->val;
rtl = elm_widget_mirrored_get(obj);
if ((!rtl && wd->inverted) || (rtl &&
((!wd->horizontal && wd->inverted) ||
(wd->horizontal && !wd->inverted)))) pos = MAX_RATIO_LVL - pos;
((!wd->horizontal && wd->inverted) ||
(wd->horizontal && !wd->inverted)))) pos = MAX_RATIO_LVL - pos;
edje_object_part_drag_value_set(wd->progressbar, "elm.cur.progressbar", pos, pos);
}
@ -359,13 +359,13 @@ elm_progressbar_label_set(Evas_Object *obj, const char *label)
eina_stringshare_replace(&wd->label, label);
if (label)
{
edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm");
edje_object_message_signal_process(wd->progressbar);
edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm");
edje_object_message_signal_process(wd->progressbar);
}
else
{
edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->progressbar);
edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->progressbar);
}
edje_object_part_text_set(wd->progressbar, "elm.text", label);
_sizing_eval(obj);
@ -411,12 +411,12 @@ elm_progressbar_icon_set(Evas_Object *obj, Evas_Object *icon)
wd->icon = icon;
if (icon)
{
elm_widget_sub_object_add(obj, icon);
evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_swallow(wd->progressbar, "elm.swallow.content", icon);
edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm");
edje_object_message_signal_process(wd->progressbar);
elm_widget_sub_object_add(obj, icon);
evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_swallow(wd->progressbar, "elm.swallow.content", icon);
edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm");
edje_object_message_signal_process(wd->progressbar);
}
_sizing_eval(obj);
}
@ -530,13 +530,13 @@ elm_progressbar_unit_format_set(Evas_Object *obj, const char *units)
eina_stringshare_replace(&wd->units, units);
if (units)
{
edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm");
edje_object_message_signal_process(wd->progressbar);
edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm");
edje_object_message_signal_process(wd->progressbar);
}
else
{
edje_object_signal_emit(wd->progressbar, "elm,state,units,hidden", "elm");
edje_object_message_signal_process(wd->progressbar);
edje_object_signal_emit(wd->progressbar, "elm,state,units,hidden", "elm");
edje_object_message_signal_process(wd->progressbar);
}
_units_set(obj);
_sizing_eval(obj);

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

@ -108,13 +108,13 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
if (!wd) return;
if (elm_widget_focus_get(obj))
{
edje_object_signal_emit(wd->radio, "elm,action,focus", "elm");
evas_object_focus_set(wd->radio, EINA_TRUE);
edje_object_signal_emit(wd->radio, "elm,action,focus", "elm");
evas_object_focus_set(wd->radio, EINA_TRUE);
}
else
{
edje_object_signal_emit(wd->radio, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->radio, EINA_FALSE);
edje_object_signal_emit(wd->radio, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->radio, EINA_FALSE);
}
}
@ -201,11 +201,11 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
if (!wd) return;
if (sub == wd->icon)
{
edje_object_signal_emit(wd->radio, "elm,state,icon,hidden", "elm");
evas_object_event_callback_del_full
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
wd->icon = NULL;
_sizing_eval(obj);
edje_object_signal_emit(wd->radio, "elm,state,icon,hidden", "elm");
evas_object_event_callback_del_full
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
wd->icon = NULL;
_sizing_eval(obj);
}
}
@ -216,11 +216,11 @@ _state_set(Evas_Object *obj, Eina_Bool state)
if (!wd) return;
if ((state != wd->state) && (!elm_widget_disabled_get(obj)))
{
wd->state = state;
if (wd->state)
edje_object_signal_emit(wd->radio, "elm,state,radio,on", "elm");
else
edje_object_signal_emit(wd->radio, "elm,state,radio,off", "elm");
wd->state = state;
if (wd->state)
edje_object_signal_emit(wd->radio, "elm,state,radio,on", "elm");
else
edje_object_signal_emit(wd->radio, "elm,state,radio,off", "elm");
}
}
@ -232,14 +232,14 @@ _state_set_all(Widget_Data *wd)
Eina_Bool disabled = EINA_FALSE;
EINA_LIST_FOREACH(wd->group->radios, l, child)
{
Widget_Data *wd2 = elm_widget_data_get(child);
Widget_Data *wd2 = elm_widget_data_get(child);
if (wd2->state) selected = child;
if (wd2->value == wd->group->value)
if (wd2->value == wd->group->value)
{
_state_set(child, 1);
if (!wd2->state) disabled = EINA_TRUE;
}
else _state_set(child, 0);
else _state_set(child, 0);
}
if ((disabled) && (selected)) _state_set(selected, 1);
}
@ -269,13 +269,13 @@ _signal_radio_on(void *data, Evas_Object *obj __UNUSED__, const char *emission _
}
/**
* Add a new radio to the parent
*
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
* @ingroup Radio
*/
* Add a new radio to the parent
*
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
* @ingroup Radio
*/
EAPI Evas_Object *
elm_radio_add(Evas_Object *parent)
{
@ -335,13 +335,13 @@ elm_radio_label_set(Evas_Object *obj, const char *label)
eina_stringshare_replace(&wd->label, label);
if (label)
{
edje_object_signal_emit(wd->radio, "elm,state,text,visible", "elm");
edje_object_message_signal_process(wd->radio);
edje_object_signal_emit(wd->radio, "elm,state,text,visible", "elm");
edje_object_message_signal_process(wd->radio);
}
else
{
edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->radio);
edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->radio);
}
edje_object_part_text_set(wd->radio, "elm.text", label);
_sizing_eval(obj);
@ -387,12 +387,12 @@ elm_radio_icon_set(Evas_Object *obj, Evas_Object *icon)
wd->icon = icon;
if (icon)
{
elm_widget_sub_object_add(obj, icon);
evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_swallow(wd->radio, "elm.swallow.content", icon);
edje_object_signal_emit(wd->radio, "elm,state,icon,visible", "elm");
edje_object_message_signal_process(wd->radio);
elm_widget_sub_object_add(obj, icon);
evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_swallow(wd->radio, "elm.swallow.content", icon);
edje_object_signal_emit(wd->radio, "elm,state,icon,visible", "elm");
edje_object_message_signal_process(wd->radio);
}
_sizing_eval(obj);
}
@ -460,19 +460,19 @@ elm_radio_group_add(Evas_Object *obj, Evas_Object *group)
if (!wd) return;
if (!wd2)
{
if (eina_list_count(wd->group->radios) == 1)
return;
wd->group->radios = eina_list_remove(wd->group->radios, obj);
wd->group = calloc(1, sizeof(Group));
wd->group->radios = eina_list_append(wd->group->radios, obj);
if (eina_list_count(wd->group->radios) == 1)
return;
wd->group->radios = eina_list_remove(wd->group->radios, obj);
wd->group = calloc(1, sizeof(Group));
wd->group->radios = eina_list_append(wd->group->radios, obj);
}
else if (wd->group == wd2->group) return;
else
{
wd->group->radios = eina_list_remove(wd->group->radios, obj);
if (!wd->group->radios) free(wd->group);
wd->group = wd2->group;
wd->group->radios = eina_list_append(wd->group->radios, obj);
wd->group->radios = eina_list_remove(wd->group->radios, obj);
if (!wd->group->radios) free(wd->group);
wd->group = wd2->group;
wd->group->radios = eina_list_append(wd->group->radios, obj);
}
if (wd->value == wd->group->value) _state_set(obj, 1);
else _state_set(obj, 0);
@ -581,15 +581,15 @@ elm_radio_value_pointer_set(Evas_Object *obj, int *valuep)
if (!wd) return;
if (valuep)
{
wd->group->valuep = valuep;
if (*(wd->group->valuep) != wd->group->value)
{
wd->group->value = *(wd->group->valuep);
_state_set_all(wd);
}
wd->group->valuep = valuep;
if (*(wd->group->valuep) != wd->group->value)
{
wd->group->value = *(wd->group->valuep);
_state_set_all(wd);
}
}
else
{
wd->group->valuep = NULL;
wd->group->valuep = NULL;
}
}

54
legacy/elementary/src/lib/elm_scroller.c
View File

@ -129,17 +129,17 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
}
else if ((!strcmp(ev->keyname, "Prior")) || (!strcmp(ev->keyname, "KP_Prior")))
{
if (page_y < 0)
y -= -(page_y * v_h) / 100;
else
y -= page_y;
if (page_y < 0)
y -= -(page_y * v_h) / 100;
else
y -= page_y;
}
else if ((!strcmp(ev->keyname, "Next")) || (!strcmp(ev->keyname, "KP_Next")))
{
if (page_y < 0)
y += -(page_y * v_h) / 100;
else
y += page_y;
if (page_y < 0)
y += -(page_y * v_h) / 100;
else
y += page_y;
}
else return EINA_FALSE;
@ -197,7 +197,7 @@ _theme_hook(Evas_Object *obj)
elm_smart_scroller_object_theme_set(obj, wd->scr,
wd->widget_name, wd->widget_base,
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);
str = edje_object_data_get(edj, "focus_highlight");
if ((str) && (!strcmp(str, "on")))
@ -221,7 +221,7 @@ _elm_scroller_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, E
/* Try Focus cycle in subitem */
if ((elm_widget_can_focus_get(cur)) || (elm_widget_child_can_focus_get(cur)))
return elm_widget_focus_next_get(cur, dir, next);
return elm_widget_focus_next_get(cur, dir, next);
/* Return */
*next = (Evas_Object *)obj;
@ -234,7 +234,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
emission, source);
emission, source);
}
static void
@ -243,7 +243,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
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
@ -251,8 +251,8 @@ _signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *so
{
Widget_Data *wd = elm_widget_data_get(obj);
edje_object_signal_callback_del_full(
elm_smart_scroller_edje_object_get(wd->scr), emission, source,
func_cb, data);
elm_smart_scroller_edje_object_get(wd->scr), emission, source,
func_cb, data);
}
static void
@ -331,11 +331,11 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
if (!wd) return;
if (sub == wd->content)
{
elm_widget_on_show_region_hook_set(wd->content, NULL, NULL);
evas_object_event_callback_del_full (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
wd->content = NULL;
_sizing_eval(obj);
elm_widget_on_show_region_hook_set(wd->content, NULL, NULL);
evas_object_event_callback_del_full (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
wd->content = NULL;
_sizing_eval(obj);
}
else if (sub == wd->scr)
wd->scr = NULL;
@ -482,7 +482,7 @@ elm_scroller_add(Evas_Object *parent)
_theme_hook(obj);
elm_widget_resize_object_set(obj, wd->scr);
evas_object_event_callback_add(wd->scr, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
_changed_size_hints, obj);
edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &minw, &minh);
evas_object_size_hint_min_set(obj, minw, minh);
@ -545,12 +545,12 @@ elm_scroller_content_set(Evas_Object *obj, Evas_Object *content)
wd->content = content;
if (content)
{
elm_widget_on_show_region_hook_set(content, _show_region_hook, obj);
elm_widget_sub_object_add(obj, content);
elm_widget_on_show_region_hook_set(content, _show_region_hook, obj);
elm_widget_sub_object_add(obj, content);
if (wd->scr)
elm_smart_scroller_child_set(wd->scr, content);
evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
}
_sizing_eval(obj);
}
@ -691,9 +691,9 @@ elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scro
Widget_Data *wd = elm_widget_data_get(obj);
const Elm_Scroller_Policy map[3] =
{
ELM_SMART_SCROLLER_POLICY_AUTO,
ELM_SMART_SCROLLER_POLICY_ON,
ELM_SMART_SCROLLER_POLICY_OFF
ELM_SMART_SCROLLER_POLICY_AUTO,
ELM_SMART_SCROLLER_POLICY_ON,
ELM_SMART_SCROLLER_POLICY_OFF
};
if ((!wd) || (!wd->scr)) return;
if ((policy_h >= 3) || (policy_v >= 3)) return;

140
legacy/elementary/src/lib/elm_slider.c
View File

@ -174,13 +174,13 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
if (!wd) return;
if (elm_widget_focus_get(obj))
{
edje_object_signal_emit(wd->slider, "elm,action,focus", "elm");
evas_object_focus_set(wd->slider, EINA_TRUE);
edje_object_signal_emit(wd->slider, "elm,action,focus", "elm");
evas_object_focus_set(wd->slider, EINA_TRUE);
}
else
{
edje_object_signal_emit(wd->slider, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->slider, EINA_FALSE);
edje_object_signal_emit(wd->slider, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->slider, EINA_FALSE);
}
}
@ -227,7 +227,7 @@ _theme_hook(Evas_Object *obj)
evas_object_size_hint_min_set(wd->spacer, 1, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale);
if (wd->inverted)
edje_object_signal_emit(wd->slider, "elm,state,inverted,on", "elm");
edje_object_signal_emit(wd->slider, "elm,state,inverted,on", "elm");
edje_object_part_swallow(wd->slider, "elm.swallow.bar", wd->spacer);
_units_set(obj);
@ -244,9 +244,9 @@ _disable_hook(Evas_Object *obj)
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (elm_widget_disabled_get(obj))
edje_object_signal_emit(wd->slider, "elm,state,disabled", "elm");
edje_object_signal_emit(wd->slider, "elm,state,disabled", "elm");
else
edje_object_signal_emit(wd->slider, "elm,state,enabled", "elm");
edje_object_signal_emit(wd->slider, "elm,state,enabled", "elm");
}
static void
@ -279,12 +279,12 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
if (!wd) return;
if (sub == wd->icon)
{
edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm");
evas_object_event_callback_del_full
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
wd->icon = NULL;
edje_object_message_signal_process(wd->slider);
_sizing_eval(obj);
edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm");
evas_object_event_callback_del_full
(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
wd->icon = NULL;
edje_object_message_signal_process(wd->slider);
_sizing_eval(obj);
}
if (sub == wd->end)
{
@ -316,21 +316,21 @@ _val_fetch(Evas_Object *obj)
double posx = 0.0, posy = 0.0, pos = 0.0, val;
if (!wd) return;
edje_object_part_drag_value_get(wd->slider, "elm.dragable.slider",
&posx, &posy);
&posx, &posy);
if (wd->horizontal) pos = posx;
else pos = posy;
rtl = elm_widget_mirrored_get(obj);
if ((!rtl && wd->inverted) || (rtl &&
((!wd->horizontal && wd->inverted) ||
(wd->horizontal && !wd->inverted)))) pos = 1.0 - pos;
((!wd->horizontal && wd->inverted) ||
(wd->horizontal && !wd->inverted)))) pos = 1.0 - pos;
val = (pos * (wd->val_max - wd->val_min)) + wd->val_min;
if (val != wd->val)
{
wd->val = val;
evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
if (wd->delay) ecore_timer_del(wd->delay);
wd->delay = ecore_timer_add(0.2, _delay_change, obj);
wd->val = val;
evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
if (wd->delay) ecore_timer_del(wd->delay);
wd->delay = ecore_timer_add(0.2, _delay_change, obj);
}
}
@ -350,8 +350,8 @@ _val_set(Evas_Object *obj)
rtl = elm_widget_mirrored_get(obj);
if ((!rtl && wd->inverted) || (rtl &&
((!wd->horizontal && wd->inverted) ||
(wd->horizontal && !wd->inverted)))) pos = 1.0 - pos;
((!wd->horizontal && wd->inverted) ||
(wd->horizontal && !wd->inverted)))) pos = 1.0 - pos;
edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", pos, pos);
}
@ -362,10 +362,10 @@ _units_set(Evas_Object *obj)
if (!wd) return;
if (wd->units)
{
char buf[1024];
char buf[1024];
snprintf(buf, sizeof(buf), wd->units, wd->val);
edje_object_part_text_set(wd->slider, "elm.units", buf);
snprintf(buf, sizeof(buf), wd->units, wd->val);
edje_object_part_text_set(wd->slider, "elm.units", buf);
}
else
edje_object_part_text_set(wd->slider, "elm.units", NULL);
@ -378,15 +378,15 @@ _indicator_set(Evas_Object *obj)
if (!wd) return;
if (wd->indicator_format_func)
{
const char *buf;
buf = wd->indicator_format_func(wd->val);
edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
const char *buf;
buf = wd->indicator_format_func(wd->val);
edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
}
else if (wd->indicator)
{
char buf[1024];
snprintf(buf, sizeof(buf), wd->indicator, wd->val);
edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
char buf[1024];
snprintf(buf, sizeof(buf), wd->indicator, wd->val);
edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
}
else
edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL);
@ -525,7 +525,7 @@ elm_slider_add(Evas_Object *parent)
edje_object_signal_callback_add(wd->slider, "drag,stop", "*", _drag_stop, obj);
edje_object_signal_callback_add(wd->slider, "drag,step", "*", _drag_step, obj);
edje_object_signal_callback_add(wd->slider, "drag,page", "*", _drag_stop, obj);
// edje_object_signal_callback_add(wd->slider, "drag,set", "*", _drag_stop, obj);
// edje_object_signal_callback_add(wd->slider, "drag,set", "*", _drag_stop, obj);
edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", 0.0, 0.0);
wd->spacer = evas_object_rectangle_add(e);
@ -562,13 +562,13 @@ elm_slider_label_set(Evas_Object *obj, const char *label)
eina_stringshare_replace(&wd->label, label);
if (label)
{
edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm");
edje_object_message_signal_process(wd->slider);
edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm");
edje_object_message_signal_process(wd->slider);
}
else
{
edje_object_signal_emit(wd->slider, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->slider);
edje_object_signal_emit(wd->slider, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->slider);
}
edje_object_part_text_set(wd->slider, "elm.text", label);
_sizing_eval(obj);
@ -617,12 +617,12 @@ elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon)
wd->icon = icon;
if (icon)
{
elm_widget_sub_object_add(obj, icon);
evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_swallow(wd->slider, "elm.swallow.icon", icon);
edje_object_signal_emit(wd->slider, "elm,state,icon,visible", "elm");
edje_object_message_signal_process(wd->slider);
elm_widget_sub_object_add(obj, icon);
evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_swallow(wd->slider, "elm.swallow.icon", icon);
edje_object_signal_emit(wd->slider, "elm,state,icon,visible", "elm");
edje_object_message_signal_process(wd->slider);
}
_sizing_eval(obj);
}
@ -648,12 +648,12 @@ elm_slider_icon_unset(Evas_Object *obj)
if (!wd) return NULL;
if (wd->icon)
{
elm_widget_sub_object_del(obj, wd->icon);
ret = wd->icon;
edje_object_part_unswallow(wd->slider, wd->icon);
edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm");
wd->icon = NULL;
_sizing_eval(obj);
elm_widget_sub_object_del(obj, wd->icon);
ret = wd->icon;
edje_object_part_unswallow(wd->slider, wd->icon);
edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm");
wd->icon = NULL;
_sizing_eval(obj);
}
return ret;
}
@ -702,9 +702,9 @@ elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size)
else
evas_object_size_hint_min_set(wd->spacer, 1, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale);
if (wd->indicator_show)
edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm");
edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm");
else
edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm");
edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm");
edje_object_part_swallow(wd->slider, "elm.swallow.bar", wd->spacer);
_sizing_eval(obj);
}
@ -753,13 +753,13 @@ elm_slider_unit_format_set(Evas_Object *obj, const char *units)
eina_stringshare_replace(&wd->units, units);
if (units)
{
edje_object_signal_emit(wd->slider, "elm,state,units,visible", "elm");
edje_object_message_signal_process(wd->slider);
edje_object_signal_emit(wd->slider, "elm,state,units,visible", "elm");
edje_object_message_signal_process(wd->slider);
}
else
{
edje_object_signal_emit(wd->slider, "elm,state,units,hidden", "elm");
edje_object_message_signal_process(wd->slider);
edje_object_signal_emit(wd->slider, "elm,state,units,hidden", "elm");
edje_object_message_signal_process(wd->slider);
}
_units_set(obj);
_sizing_eval(obj);
@ -1053,12 +1053,12 @@ elm_slider_end_set(Evas_Object *obj, Evas_Object *end)
wd->end = end;
if (end)
{
elm_widget_sub_object_add(obj, end);
evas_object_event_callback_add(end, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_swallow(wd->slider, "elm.swallow.end", end);
edje_object_signal_emit(wd->slider, "elm,state,end,visible", "elm");
edje_object_message_signal_process(wd->slider);
elm_widget_sub_object_add(obj, end);
evas_object_event_callback_add(end, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints, obj);
edje_object_part_swallow(wd->slider, "elm.swallow.end", end);
edje_object_signal_emit(wd->slider, "elm,state,end,visible", "elm");
edje_object_message_signal_process(wd->slider);
}
_sizing_eval(obj);
}
@ -1084,12 +1084,12 @@ elm_slider_end_unset(Evas_Object *obj)
if (!wd) return NULL;
if (wd->end)
{
elm_widget_sub_object_del(obj, wd->end);
ret = wd->end;
edje_object_part_unswallow(wd->slider, wd->end);
edje_object_signal_emit(wd->slider, "elm,state,end,hidden", "elm");
wd->end = NULL;
_sizing_eval(obj);
elm_widget_sub_object_del(obj, wd->end);
ret = wd->end;
edje_object_part_unswallow(wd->slider, wd->end);
edje_object_signal_emit(wd->slider, "elm,state,end,hidden", "elm");
wd->end = NULL;
_sizing_eval(obj);
}
return ret;
}
@ -1130,12 +1130,12 @@ elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show)
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (show) {
wd->indicator_show = EINA_TRUE;
edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm");
wd->indicator_show = EINA_TRUE;
edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm");
}
else {
wd->indicator_show = EINA_FALSE;
edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm");
wd->indicator_show = EINA_FALSE;
edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm");
}
}

152
legacy/elementary/src/lib/elm_slideshow.c
View File

@ -45,8 +45,8 @@ struct _Widget_Data
Eina_Bool loop:1;
struct {
const char *current;
Eina_List *list; //list of const char *
const char *current;
Eina_List *list; //list of const char *
} layout;
};
@ -112,7 +112,7 @@ _del_hook(Evas_Object *obj)
elm_widget_stringlist_free(wd->transitions);
if (wd->timer) ecore_timer_del(wd->timer);
EINA_LIST_FREE(wd->layout.list, layout)
eina_stringshare_del(layout);
eina_stringshare_del(layout);
free(wd);
}
@ -123,13 +123,13 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
if (!wd) return;
if (elm_widget_focus_get(obj))
{
edje_object_signal_emit(wd->slideshow, "elm,action,focus", "elm");
evas_object_focus_set(wd->slideshow, EINA_TRUE);
edje_object_signal_emit(wd->slideshow, "elm,action,focus", "elm");
evas_object_focus_set(wd->slideshow, EINA_TRUE);
}
else
{
edje_object_signal_emit(wd->slideshow, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->slideshow, EINA_FALSE);
edje_object_signal_emit(wd->slideshow, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->slideshow, EINA_FALSE);
}
}
@ -168,20 +168,20 @@ _sizing_eval(Evas_Object *obj)
static Elm_Slideshow_Item* _item_prev_get(Elm_Slideshow_Item* item)
{
Widget_Data *wd = elm_widget_data_get(item->base.widget);
Elm_Slideshow_Item* prev = eina_list_data_get(eina_list_prev(item->l));
if((!prev) && (wd->loop))
prev = eina_list_data_get(eina_list_last(item->l));
return prev;
Widget_Data *wd = elm_widget_data_get(item->base.widget);
Elm_Slideshow_Item* prev = eina_list_data_get(eina_list_prev(item->l));
if((!prev) && (wd->loop))
prev = eina_list_data_get(eina_list_last(item->l));
return prev;
}
static Elm_Slideshow_Item* _item_next_get(Elm_Slideshow_Item* item)
{
Widget_Data *wd = elm_widget_data_get(item->base.widget);
Elm_Slideshow_Item* next = eina_list_data_get(eina_list_next(item->l));
if((!next) && (wd->loop))
next = eina_list_data_get(wd->items);
return next;
Widget_Data *wd = elm_widget_data_get(item->base.widget);
Elm_Slideshow_Item* next = eina_list_data_get(eina_list_next(item->l));
if((!next) && (wd->loop))
next = eina_list_data_get(wd->items);
return next;
}
@ -256,28 +256,28 @@ _item_realize(Elm_Slideshow_Item *item)
static void
_end(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
Elm_Slideshow_Item *item;
Widget_Data *wd = elm_widget_data_get(data);
if (!wd) return;
Elm_Slideshow_Item *item;
Widget_Data *wd = elm_widget_data_get(data);
if (!wd) return;
item = wd->previous;
if(item)
{
edje_object_part_unswallow(NULL, item->base.view);
evas_object_hide(item->base.view);
wd->previous = NULL;
}
item = wd->previous;
if(item)
{
edje_object_part_unswallow(NULL, item->base.view);
evas_object_hide(item->base.view);
wd->previous = NULL;
}
item = wd->current;
if ((!item) || (!item->base.view)) return;
item = wd->current;
if ((!item) || (!item->base.view)) return;
_item_realize(item);
edje_object_part_unswallow(NULL, item->base.view);
evas_object_show(item->base.view);
_item_realize(item);
edje_object_part_unswallow(NULL, item->base.view);
evas_object_show(item->base.view);
edje_object_signal_emit(wd->slideshow, "anim,end", "slideshow");
edje_object_part_swallow(wd->slideshow, "elm.swallow.1", item->base.view);
edje_object_signal_emit(wd->slideshow, "anim,end", "slideshow");
edje_object_part_swallow(wd->slideshow, "elm.swallow.1", item->base.view);
}
@ -336,7 +336,7 @@ elm_slideshow_add(Evas_Object *parent)
wd->layout.list = elm_widget_stringlist_get(edje_object_data_get(wd->slideshow, "layouts"));
if (eina_list_count(wd->layout.list) > 0)
wd->layout.current = eina_list_data_get(wd->layout.list);
wd->layout.current = eina_list_data_get(wd->layout.list);
edje_object_signal_callback_add(wd->slideshow, "end", "slideshow", _end, obj);
@ -404,7 +404,7 @@ elm_slideshow_show(Elm_Slideshow_Item *item)
if (wd->timer) ecore_timer_del(wd->timer);
if (wd->timeout > 0.0)
wd->timer = ecore_timer_add(wd->timeout, _timer_cb, item->base.widget);
wd->timer = ecore_timer_add(wd->timeout, _timer_cb, item->base.widget);
_item_realize(next);
edje_object_part_swallow(wd->slideshow, "elm.swallow.2", next->base.view);
evas_object_show(next->base.view);
@ -433,7 +433,7 @@ elm_slideshow_next(Evas_Object *obj)
if (!wd) return;
if (wd->current)
next = _item_next_get(wd->current);
next = _item_next_get(wd->current);
if ((!next) || (next == wd->current)) return;
@ -441,7 +441,7 @@ elm_slideshow_next(Evas_Object *obj)
if (wd->timer) ecore_timer_del(wd->timer);
if (wd->timeout > 0.0)
wd->timer = ecore_timer_add(wd->timeout, _timer_cb, obj);
wd->timer = ecore_timer_add(wd->timeout, _timer_cb, obj);
_item_realize(next);
@ -482,7 +482,7 @@ elm_slideshow_previous(Evas_Object *obj)
if (wd->timer) ecore_timer_del(wd->timer);
if (wd->timeout > 0.0)
wd->timer = ecore_timer_add(wd->timeout, _timer_cb, obj);
wd->timer = ecore_timer_add(wd->timeout, _timer_cb, obj);
_item_realize(prev);
@ -686,24 +686,24 @@ elm_slideshow_loop_get(const Evas_Object *obj)
EAPI void
elm_slideshow_clear(Evas_Object *obj)
{
Elm_Slideshow_Item *item;
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
wd->previous = NULL;
wd->current = NULL;
EINA_LIST_FREE(wd->items_built, item)
{
if (item->itc->func.del)
item->itc->func.del((void*)item->base.data, item->base.view);
evas_object_del(item->base.view);
item->base.view = NULL;
}
Elm_Slideshow_Item *item;
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
wd->previous = NULL;
wd->current = NULL;
EINA_LIST_FREE(wd->items_built, item)
{
if (item->itc->func.del)
item->itc->func.del((void*)item->base.data, item->base.view);
evas_object_del(item->base.view);
item->base.view = NULL;
}
EINA_LIST_FREE(wd->items, item)
{
elm_widget_item_del(item);
}
EINA_LIST_FREE(wd->items, item)
{
elm_widget_item_del(item);
}
}
@ -718,28 +718,28 @@ EAPI void
elm_slideshow_item_del(Elm_Slideshow_Item *item)
{
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
Widget_Data *wd = elm_widget_data_get(item->base.widget);
if (!wd) return;
if (wd->previous == item) wd->previous = NULL;
if (wd->current == item)
{
Eina_List *l = eina_list_data_find_list(wd->items, item);
Eina_List *l2 = eina_list_next(l);
wd->current = NULL;
if (!l2)
l2 = eina_list_nth_list(wd->items, eina_list_count(wd->items) - 1);
if (l2)
elm_slideshow_show(eina_list_data_get(l2));
}
Widget_Data *wd = elm_widget_data_get(item->base.widget);
if (!wd) return;
if (wd->previous == item) wd->previous = NULL;
if (wd->current == item)
{
Eina_List *l = eina_list_data_find_list(wd->items, item);
Eina_List *l2 = eina_list_next(l);
wd->current = NULL;
if (!l2)
l2 = eina_list_nth_list(wd->items, eina_list_count(wd->items) - 1);
if (l2)
elm_slideshow_show(eina_list_data_get(l2));
}
wd->items = eina_list_remove_list(wd->items, item->l);
wd->items_built = eina_list_remove_list(wd->items_built, item->l_built);
wd->items = eina_list_remove_list(wd->items, item->l);
wd->items_built = eina_list_remove_list(wd->items_built, item->l_built);
if ((item->base.view) && (item->itc->func.del))
item->itc->func.del((void*)item->base.data, item->base.view);
if (item->base.view)
evas_object_del(item->base.view);
free(item);
if ((item->base.view) && (item->itc->func.del))
item->itc->func.del((void*)item->base.data, item->base.view);
if (item->base.view)
evas_object_del(item->base.view);
free(item);
}
/**

90
legacy/elementary/src/lib/elm_spinner.c
View File

@ -150,13 +150,13 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
if (!wd) return;
if (elm_widget_focus_get(obj))
{
edje_object_signal_emit(wd->spinner, "elm,action,focus", "elm");
evas_object_focus_set(wd->spinner, EINA_TRUE);
edje_object_signal_emit(wd->spinner, "elm,action,focus", "elm");
evas_object_focus_set(wd->spinner, EINA_TRUE);
}
else
{
edje_object_signal_emit(wd->spinner, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->spinner, EINA_FALSE);
edje_object_signal_emit(wd->spinner, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->spinner, EINA_FALSE);
}
}
@ -183,31 +183,31 @@ _entry_show(Widget_Data *wd)
const char *start = strchr(wd->label, '%');
while (start)
{
/* handle %% */
if (start[1] != '%')
break;
else
start = strchr(start + 2, '%');
/* handle %% */
if (start[1] != '%')
break;
else
start = strchr(start + 2, '%');
}
if (start)
{
const char *itr, *end = NULL;
for (itr = start + 1; *itr != '\0'; itr++)
{
/* allowing '%d' is quite dangerous, remove it? */
if ((*itr == 'd') || (*itr == 'f'))
{
end = itr + 1;
break;
}
}
const char *itr, *end = NULL;
for (itr = start + 1; *itr != '\0'; itr++)
{
/* allowing '%d' is quite dangerous, remove it? */
if ((*itr == 'd') || (*itr == 'f'))
{
end = itr + 1;
break;
}
}
if ((end) && ((size_t)(end - start + 1) < sizeof(fmt)))
{
memcpy(fmt, start, end - start);
fmt[end - start] = '\0';
}
if ((end) && ((size_t)(end - start + 1) < sizeof(fmt)))
{
memcpy(fmt, start, end - start);
fmt[end - start] = '\0';
}
}
}
snprintf(buf, sizeof(buf), fmt, wd->val);
@ -286,12 +286,12 @@ _sizing_eval(Evas_Object *obj)
}
/*
static void
_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
static void
_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
_sizing_eval(data);
}
*/
}
*/
static void
_val_set(Evas_Object *obj)
@ -316,7 +316,7 @@ _drag(void *data, Evas_Object *_obj __UNUSED__, const char *emission __UNUSED__,
if (!wd) return;
if (wd->entry_visible) return;
edje_object_part_drag_value_get(wd->spinner, "elm.dragable.slider",
&pos, NULL);
&pos, NULL);
offset = wd->step;
delta = (pos - wd->drag_start_pos) * offset;
/* If we are on rtl mode, change the delta to be negative on such changes */
@ -334,7 +334,7 @@ _drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUS
double pos;
if (!wd) return;
edje_object_part_drag_value_get(wd->spinner, "elm.dragable.slider",
&pos, NULL);
&pos, NULL);
wd->drag_start_pos = pos;
}
@ -398,10 +398,10 @@ _toggle_entry(void *data, Evas_Object *obj __UNUSED__, const char *emission __UN
else
{
wd->orig_val = wd->val;
edje_object_signal_emit(wd->spinner, "elm,state,active", "elm");
edje_object_signal_emit(wd->spinner, "elm,state,active", "elm");
_entry_show(wd);
elm_entry_select_all(wd->ent);
elm_widget_focus_set(wd->ent, 1);
elm_widget_focus_set(wd->ent, 1);
wd->entry_visible = 1;
}
}
@ -551,13 +551,13 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
|| !strcmp(ev->keyname, "Up") || !strcmp(ev->keyname, "KP_Up"))
_val_inc_stop(obj);
else if (!strcmp(ev->keyname, "Left") || !strcmp(ev->keyname, "KP_Left")
|| !strcmp(ev->keyname, "Down") || !strcmp(ev->keyname, "KP_Down"))
|| !strcmp(ev->keyname, "Down") || !strcmp(ev->keyname, "KP_Down"))
_val_dec_stop(obj);
else return EINA_FALSE;
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE;
}
return EINA_FALSE;
return EINA_FALSE;
}
/**
@ -847,18 +847,18 @@ elm_spinner_wrap_get(const Evas_Object *obj)
EAPI void
elm_spinner_special_value_add(Evas_Object *obj, double value, const char *label)
{
Elm_Spinner_Special_Value *sv;
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
Elm_Spinner_Special_Value *sv;
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
sv = calloc(1, sizeof(*sv));
if (!sv) return;
sv->value = value;
sv->label = eina_stringshare_add(label);
sv = calloc(1, sizeof(*sv));
if (!sv) return;
sv->value = value;
sv->label = eina_stringshare_add(label);
wd->special_values = eina_list_append(wd->special_values, sv);
_write_label(obj);
wd->special_values = eina_list_append(wd->special_values, sv);
_write_label(obj);
}
/**

880
legacy/elementary/src/lib/elm_store.c
View File

File diff suppressed because it is too large Load Diff