Change-Id: I21d0ddf313a79fb4c254f29fa433837d1a5a11b7
else
wd->final_position = _FINAL_POS_BY_ORIENTATION(0);
}
else
wd->final_position = _FINAL_POS_BY_ORIENTATION(0);
}
- wd->icon_animator = ecore_animator_add(_icon_animation, wd);
+ wd->icon_animator = ecore_animator_add(_icon_animation, as);
#undef _FINAL_POS_BY_ORIENTATION
}
#undef _FINAL_POS_BY_ORIENTATION
}
static Eina_Bool
_icon_animation(void *data)
{
static Eina_Bool
_icon_animation(void *data)
{
- Evas_Object *as = data;
- Widget_Data *wd = (Widget_Data *)data;
- if (!wd)
- {
- wd->icon_animator = NULL;
- return ECORE_CALLBACK_CANCEL;
- }
+ Widget_Data *wd = elm_widget_data_get(data);
double cur_position = 0.0, new_position = 0.0;
double move_amount = 0.05;
double adjusted_final;
Eina_Bool flag_finish_animation = EINA_FALSE;
double cur_position = 0.0, new_position = 0.0;
double move_amount = 0.05;
double adjusted_final;
Eina_Bool flag_finish_animation = EINA_FALSE;
+ if (!wd) return ECORE_CALLBACK_CANCEL;
+
edje_object_part_drag_value_get(wd->as, "elm.swallow.icon", &cur_position, NULL);
edje_object_part_drag_value_get(wd->as, "elm.swallow.icon", &cur_position, NULL);
- adjusted_final = (!elm_widget_mirrored_get(as)) ? wd->final_position : 1.0 - wd->final_position;
+ adjusted_final = (!elm_widget_mirrored_get(data)) ? wd->final_position : 1.0 - wd->final_position;
if ( (adjusted_final == 0.0) ||(adjusted_final == 0.5 && cur_position >= adjusted_final) )
{
if ( (adjusted_final == 0.0) ||(adjusted_final == 0.5 && cur_position >= adjusted_final) )
{
if (wd->date_focusedpart == ENTRY_YEAR)
{
edje_object_signal_emit(wd->base, "elm,state,year,focus,in", "elm");
if (wd->date_focusedpart == ENTRY_YEAR)
{
edje_object_signal_emit(wd->base, "elm,state,year,focus,in", "elm");
- value =(char *)edje_object_part_text_get(wd->base,"elm.text.date.year");
+ value = edje_object_part_text_get(wd->base,"elm.text.date.year");
edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
"elm.rect.date.year.over");
count_start = wd->y_min;
edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
"elm.rect.date.year.over");
count_start = wd->y_min;
else if (wd->date_focusedpart == ENTRY_MON)
{
edje_object_signal_emit(wd->base, "elm,state,month,focus,in", "elm");
else if (wd->date_focusedpart == ENTRY_MON)
{
edje_object_signal_emit(wd->base, "elm,state,month,focus,in", "elm");
- value=(char *)edje_object_part_text_get(wd->base,"elm.text.date.month");
+ value= edje_object_part_text_get(wd->base,"elm.text.date.month");
edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
"elm.rect.date.month.over");
count_start = 0;
edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
"elm.rect.date.month.over");
count_start = 0;
else if (wd->date_focusedpart == ENTRY_DAY)
{
edje_object_signal_emit(wd->base, "elm,state,day,focus,in", "elm");
else if (wd->date_focusedpart == ENTRY_DAY)
{
edje_object_signal_emit(wd->base, "elm,state,day,focus,in", "elm");
- value = (char *)edje_object_part_text_get(wd->base,"elm.text.date.day");
- edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
+ value = edje_object_part_text_get(wd->base,"elm.text.date.day");
+ edj_part =(Evas_Object *) edje_object_part_object_get(wd->base,
"elm.rect.date.day.over");
count_start = 1;
count_end = _maximum_day_get(wd->year, wd->month);
"elm.rect.date.day.over");
count_start = 1;
count_end = _maximum_day_get(wd->year, wd->month);
else if (wd->date_focusedpart == ENTRY_HOUR)
{
edje_object_signal_emit(wd->base, "elm,state,hour,focus,in", "elm");
else if (wd->date_focusedpart == ENTRY_HOUR)
{
edje_object_signal_emit(wd->base, "elm,state,hour,focus,in", "elm");
- value =(char *)edje_object_part_text_get(wd->base,"elm.text.time.hour");
+ value = edje_object_part_text_get(wd->base,"elm.text.time.hour");
edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
"elm.rect.time.hour.over");
if (wd->time_mode)
edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
"elm.rect.time.hour.over");
if (wd->time_mode)
else if (wd->date_focusedpart == ENTRY_MIN)
{
edje_object_signal_emit(wd->base, "elm,state,min,focus,in", "elm");
else if (wd->date_focusedpart == ENTRY_MIN)
{
edje_object_signal_emit(wd->base, "elm,state,min,focus,in", "elm");
- value = (char *)edje_object_part_text_get(wd->base,"elm.text.time.min");
+ value = edje_object_part_text_get(wd->base,"elm.text.time.min");
edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
"elm.rect.time.min.over");
count_start = 0;
edj_part = (Evas_Object *)edje_object_part_object_get(wd->base,
"elm.rect.time.min.over");
count_start = 0;
else
snprintf(str, sizeof(str), "%02d", idx);
item_list[idx] = eina_stringshare_add(str);
else
snprintf(str, sizeof(str), "%02d", idx);
item_list[idx] = eina_stringshare_add(str);
- if (strcmp(value, item_list[idx]) == 0)
+ if ((value) && (strcmp(value, item_list[idx]) == 0))
item = elm_diskselector_item_append(diskselector,item_list[idx],NULL,
_diskselector_cb, data);
else
item = elm_diskselector_item_append(diskselector,item_list[idx],NULL,
_diskselector_cb, data);
else
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
- e = evas_object_evas_get(parent);
- if (!e) return NULL;
- wd = ELM_NEW(Widget_Data);
- obj = elm_widget_add(e);
ELM_SET_WIDTYPE(widtype, "datefield");
elm_widget_type_set(obj, "datefield");
elm_widget_sub_object_add(parent, obj);
ELM_SET_WIDTYPE(widtype, "datefield");
elm_widget_type_set(obj, "datefield");
elm_widget_sub_object_add(parent, obj);
if (wd->time_mode != mode)
{
if (wd->time_mode != mode)
{
- wd->time_mode = mode;
- if (!wd->time_mode) edje_object_signal_emit(wd->base, "elm,state,mode,24h",
- "elm");
- else edje_object_signal_emit(wd->base, "elm,state,mode,12h", "elm");
- edje_object_message_signal_process(wd->base);
- _date_update(obj);
+ wd->time_mode = mode;
+ if (!wd->time_mode)
+ edje_object_signal_emit(wd->base, "elm,state,mode,24h","elm");
+ else
+ edje_object_signal_emit(wd->base, "elm,state,mode,12h", "elm");
+ edje_object_message_signal_process(wd->base);
+ _date_update(obj);