//
if (!sd->nmax) return;
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ sd->is_append = EINA_FALSE;
+ //
sd->reorder_item_changed = EINA_FALSE;
EINA_INLIST_FOREACH(sd->items, it)
_elm_gengrid_item_append(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd, const Elm_Gengrid_Item_Class *itc, const void *data, Evas_Smart_Cb func, const void *func_data)
{
Elm_Gen_Item *it;
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ int pos_x, pos_y, min_x, min_y;
+ //
it = _elm_gengrid_item_new(sd, itc, data, func, func_data);
if (!it) return NULL;
//ecore_job_del(sd->calc_job);
//sd->calc_job = ecore_job_add(_calc_job, obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ sd->is_append = EINA_TRUE;
+ eo_do(sd->pan_obj, elm_obj_pan_pos_get(&pos_x, &pos_y),
+ elm_obj_pan_pos_min_get(&min_x, &min_y));
+ sd->top_to_x = pos_x - min_x;
+ sd->top_to_y = pos_y - min_y;
+ //
return EO_OBJ(it);
}
_elm_gengrid_item_insert_after(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd, const Elm_Gengrid_Item_Class *itc, const void *data, Elm_Object_Item *eo_relative, Evas_Smart_Cb func, const void *func_data)
{
Elm_Gen_Item *it;
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ int pos_x, pos_y, min_x, min_y;
+ //
Eina_Inlist *tmp;
EINA_SAFETY_ON_NULL_RETURN_VAL(eo_relative, NULL);
ELM_GENGRID_ITEM_DATA_GET(eo_relative, relative);
//sd->calc_job = ecore_job_add(_calc_job, obj);
//
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ sd->is_append = EINA_TRUE;
+ eo_do(sd->pan_obj, elm_obj_pan_pos_get(&pos_x, &pos_y),
+ elm_obj_pan_pos_min_get(&min_x, &min_y));
+ sd->top_to_x = pos_x - min_x;
+ sd->top_to_y = pos_y - min_y;
+ //
+
return EO_OBJ(it);
}
return ret;
}
+//TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+EOLIAN static void
+_elm_gengrid_elm_interface_scrollable_wanted_region_set(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED)
+{
+ if (sd->is_append)
+ {
+ Evas_Coord pan_x, pan_y;
+ Evas_Coord minx, miny;
+ Evas_Coord set_x, set_y;
+
+ eo_do(sd->pan_obj, elm_obj_pan_pos_get(&pan_x, &pan_y),
+ elm_obj_pan_pos_min_get(&minx, &miny));
+
+ if (sd->horizontal)
+ {
+ set_x = minx + sd->top_to_x;
+ eo_do(sd->obj, elm_interface_scrollable_content_pos_set(set_x, pan_y, EINA_TRUE));
+ }
+ else
+ {
+ set_y = miny + sd->top_to_y;
+ eo_do(sd->obj, elm_interface_scrollable_content_pos_set(pan_x, set_y, EINA_TRUE));
+ }
+ }
+}
+//
+
EOLIAN static Eina_Bool
_elm_gengrid_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_Gen_Item *it)
{
sid->down.pdx = 0;
sid->down.pdy = 0;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
}
sid->bouncemex = EINA_FALSE;
_elm_scroll_momentum_end(sid);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
return ECORE_CALLBACK_CANCEL;
}
}
sid->bouncemey = EINA_FALSE;
_elm_scroll_momentum_end(sid);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
return ECORE_CALLBACK_CANCEL;
}
}
{
ELM_SAFE_FREE(sid->down.onhold_animator, ecore_animator_del);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (sid->down.hold_animator)
{
ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
ELM_SAFE_FREE(sid->down.bounce_x_animator, ecore_animator_del);
sid->bouncemex = EINA_FALSE;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (sid->down.bounce_y_animator)
{
ELM_SAFE_FREE(sid->down.bounce_y_animator, ecore_animator_del);
sid->bouncemey = EINA_FALSE;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
_elm_scroll_anim_stop(sid);
ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
_elm_scroll_drag_stop(sid);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (sid->down.momentum_animator)
{
sid->down.pdx = 0;
sid->down.pdy = 0;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (_paging_is_enabled(sid))
}
}
-static void
-_elm_scroll_wanted_region_set(Evas_Object *obj)
+//TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+//static void
+//_elm_scroll_wanted_region_set(Evas_Object *obj)
+EOLIAN static void
+_elm_interface_scrollable_wanted_region_set(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED)
+//
{
Evas_Coord ww, wh, wx;
- ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
+//TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+// ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid);
+//
wx = sid->wx;
ELM_SAFE_FREE(sid->down.bounce_x_animator, ecore_animator_del);
sid->bouncemex = EINA_FALSE;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (sid->down.bounce_y_animator)
{
ELM_SAFE_FREE(sid->down.bounce_y_animator, ecore_animator_del);
sid->bouncemey = EINA_FALSE;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
(NULL, NULL, &vw, &vh));
sid->down.pdx = 0;
sid->down.pdy = 0;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
return ECORE_CALLBACK_CANCEL;
}
ELM_SAFE_FREE(sid->down.bounce_y_animator, ecore_animator_del);
_elm_scroll_momentum_end(sid);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
sid->bouncemey = EINA_FALSE;
}
ELM_SAFE_FREE(sid->down.bounce_x_animator, ecore_animator_del);
_elm_scroll_momentum_end(sid);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
sid->bouncemex = EINA_FALSE;
}
{
ELM_SAFE_FREE(sid->down.onhold_animator, ecore_animator_del);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
x = ev->canvas.x - sid->down.x;
y = ev->canvas.y - sid->down.y;
{
ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (sid->down.scroll)
{
_elm_scroll_wanted_coordinates_update(sid, x, y);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
if (!_paging_is_enabled(sid))
_elm_scroll_bounce_eval(sid);
ELM_SAFE_FREE(sid->down.bounce_x_animator, ecore_animator_del);
sid->bouncemex = EINA_FALSE;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (sid->down.bounce_y_animator)
{
ELM_SAFE_FREE(sid->down.bounce_y_animator, ecore_animator_del);
sid->bouncemey = EINA_FALSE;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (sid->down.hold_animator)
{
ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
_elm_scroll_drag_stop(sid);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (sid->down.momentum_animator)
{
sid->down.ax = 0;
sid->down.ay = 0;
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
if (ev->button == 1)
{
{
ELM_SAFE_FREE(sid->down.onhold_animator, ecore_animator_del);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
}
}
sid->size_count = 0;
}
if (reconf_ok) _elm_scroll_reconfigure(sid);
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
static void
evas_object_size_hint_min_set
(sid->edje_obj, sid->content_info.w, sid->content_info.h);
sid->content_info.resized = EINA_TRUE;
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
return EINA_TRUE;
{
ELM_SAFE_FREE(sid->down.momentum_animator, ecore_animator_del);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
}
}
{
ELM_SAFE_FREE(sid->down.onhold_animator, ecore_animator_del);
if (sid->content_info.resized)
- _elm_scroll_wanted_region_set(sid->obj);
+ //TIZEN_ONLY(20150825) : Use the specific wanted_region_set func only for gengrid.
+ //_elm_scroll_wanted_region_set(sid->obj);
+ eo_do(sid->obj, elm_interface_scrollable_wanted_region_set(sid->wx, sid->wy));
+ //
}
}
else