-/*
-*
-* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+/*
+*
+* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include <stdio.h>
#include <math.h>
* @defgroup Imageslider Imageslider
* @ingroup Elementary
*
-* By flicking images on the screen,
+* By flicking images on the screen,
* you can see the images in specific path.
*/
const char *photo_file;
void (*func) (void *data, Evas_Object *obj, void *event_info);
void *data;
- Evas_Coord x, y, w, h;
- Evas_Coord ox, oy, ow, oh;
- int moving:1;
+ //Evas_Coord x, y, w, h;
+ //Evas_Coord ox, oy, ow, oh;
+ //int moving:1;
};
// Image Slider Widget Data.
int moving:1;
Eina_Bool on_zoom:1;
- Eina_Bool on_hold:1;
int dx, dy, mx, my;
int mdx, mdy, mmx, mmy;
int dratio;
static void
_theme_hook(Evas_Object *obj)
{
- int i;
-
- Widget_Data *wd;
-
- wd = elm_widget_data_get(obj);
+ int i = 0;
+ Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd || !wd->ly)
- return;
+ if (!wd) return;
for (i = 0; i < BLOCK_MAX; i++)
{
- wd->ly[i] = elm_layout_add(obj);
- _elm_theme_object_set(obj, wd->ly[i], "imageslider", "base", "default");
+ if (wd->ly[i])
+ elm_layout_theme_set(wd->ly[i], "imageslider", "base",
+ elm_object_style_get(obj));
evas_object_show(wd->ly[i]);
}
-
+ _imageslider_update(wd);
_sizing_eval(obj);
}
// Whenever MOVE event occurs, Call this function.
static void
-_imageslider_move(void *data, Evas * e, Evas_Object *obj, void *event_info)
+_imageslider_move(void *data, Evas * e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Widget_Data *wd;
// Whenever RESIZE event occurs, Call this fucntion.
static void
-_imageslider_resize(void *data, Evas * e, Evas_Object *obj, void *event_info)
+_imageslider_resize(void *data, Evas * e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
int i;
return;
wd = elm_widget_data_get((Evas_Object *) data);
- if (!wd || !wd->ly)
+ if (!wd)
return;
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
// Whenever SHOW event occurs, Call this function.
static void
-_imageslider_show(void *data, Evas * e, Evas_Object *obj, void *event_info)
+_imageslider_show(void *data, Evas * e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Widget_Data *wd;
// Whenever HIDE event occurs, Call this function.
static void
-_imageslider_hide(void *data, Evas * e, Evas_Object *obj, void *event_info)
+_imageslider_hide(void *data, Evas * e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Widget_Data *wd;
// Update the center position of Image Slider item.
static void
-_imageslider_update_center_pos(Widget_Data * wd, Evas_Coord x, Evas_Coord my, Evas_Coord y, Evas_Coord w)
+_imageslider_update_center_pos(Widget_Data * wd, Evas_Coord x, Evas_Coord my __UNUSED__, Evas_Coord y, Evas_Coord w)
{
- Evas_Coord ix, iy, iw, ih;
+ Evas_Coord ix = 0, iy = 0, iw = 0, ih = 0;
const Evas_Object *eo = elm_layout_content_get((const Evas_Object*)(wd->ly[BLOCK_CENTER]), "swl.photo");
- evas_object_geometry_get(eo, &ix, &iy, &iw, &ih);
+ if (eo)
+ evas_object_geometry_get(eo, &ix, &iy, &iw, &ih);
if ((ix > 0) || (ix + iw < wd->w))
{
edje_object_signal_emit(elm_layout_edje_get(wd->ly[BLOCK_CENTER]), "block.on", "block");
{
wd->step = -ANI_STEP;
wd->move_x += wd->w;
- _imageslider_obj_shift(wd, 0);
+ _imageslider_obj_shift(wd, EINA_FALSE);
}
- wd->moving = 1;
+ wd->moving = EINA_TRUE;
}
else if (step < 0)
{
{
wd->step = ANI_STEP;
wd->move_x -= wd->w;
- _imageslider_obj_shift(wd, 1);
+ _imageslider_obj_shift(wd, EINA_TRUE);
}
- wd->moving = 1;
+ wd->moving = EINA_TRUE;
}
else
{
wd->step = ANI_STEP;
else
wd->step = -ANI_STEP;
- wd->moving = 0;
+ wd->moving = EINA_FALSE;
}
_imageslider_update(wd);
// Whenever MOUSE DOWN event occurs, Call this function.
static void
-_ev_imageslider_down_cb(void *data, Evas * e, Evas_Object *obj, void *event_info)
+_ev_imageslider_down_cb(void *data, Evas * e __UNUSED__, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = data;
-
+ Evas_Coord ix = 0, iy = 0, iw = 0, ih = 0;
Evas_Event_Mouse_Down *ev = event_info;
-
- Evas_Coord ix, iy, iw, ih;
-
Evas_Object *eo = NULL;
if (wd->ani_lock)
wd->timestamp = ev->timestamp;
wd->move_cnt = MOVE_STEP;
- wd->dx = ev->canvas.x;
+ /*wd->dx = ev->canvas.x;
wd->dy = ev->canvas.y;
wd->mx = ev->canvas.x;
wd->my = ev->canvas.y;
if (iw != wd->w)
{
+ printf("Zooming\n");
wd->on_zoom = EINA_TRUE;
edje_object_signal_emit(elm_layout_edje_get(obj), "block.off", "block");
- }
-
+ }*/
}
// Whenever MOUSE UP event occurs, Call this function.
// And make Click Event also.
static void
-_ev_imageslider_up_cb(void *data, Evas * e, Evas_Object *obj, void *event_info)
+_ev_imageslider_up_cb(void *data, Evas * e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Widget_Data *wd = data;
}
-// Whenever MOUSE MOVE event occurs, Call this API.
+// Whenever MOUSE MOVE event occurs, Call this
static void
-_ev_imageslider_move_cb(void *data, Evas * e, Evas_Object *obj, void *event_info)
+_ev_imageslider_move_cb(void *data, Evas * e __UNUSED__, Evas_Object *obj, void *event_info)
{
int idx;
if (wd->move_cnt == MOVE_STEP)
{
- if (wd->on_hold == EINA_FALSE)
- {
- wd->move_cnt = 0;
+ wd->move_cnt = 0;
- if (ev->buttons)
- {
- step = ev->cur.canvas.x - wd->down_pos.x;
- if (step > 0)
- idx = BLOCK_LEFT;
- else
- idx = BLOCK_RIGHT;
-
- wd->move_x = wd->x + ((ev->cur.canvas.x - wd->down_pos.x));
- wd->move_y = wd->y + ((ev->cur.canvas.y - wd->down_pos.y));
-
- if (wd->on_zoom)
- {
- _imageslider_update_center_pos(wd, wd->move_x, wd->move_y, wd->y, wd->w);
- }
- else
- {
- _imageslider_update_pos(wd, wd->move_x, wd->y, wd->w);
- }
- }
- }
- else
+ if (ev->buttons)
{
- wd->mx = ev->cur.canvas.x;
- wd->my = ev->cur.canvas.y;
+ step = ev->cur.canvas.x - wd->down_pos.x;
+ if (step > 0)
+ idx = BLOCK_LEFT;
+ else
+ idx = BLOCK_RIGHT;
- wd->ratio =
- sqrt((wd->mx - wd->mmx) * (wd->mx - wd->mmx) + (wd->my - wd->mmy) * (wd->my - wd->mmy));
+ wd->move_x = wd->x + ((ev->cur.canvas.x - wd->down_pos.x));
+ wd->move_y = wd->y + ((ev->cur.canvas.y - wd->down_pos.y));
- eo = (Evas_Object*)elm_layout_content_get((const Evas_Object*)obj, "swl.photo");
- if (eo)
+ /*if (wd->on_zoom)
{
- it = eina_list_data_get(wd->cur);
- if (((it->w * wd->ratio / wd->dratio) / it->ow) < MAX_ZOOM_SIZE)
- {
- edje_object_part_unswallow(elm_layout_edje_get(obj), eo);
- evas_object_resize(eo, it->w * wd->ratio / wd->dratio, it->h * wd->ratio / wd->dratio);
- evas_object_size_hint_min_set(eo, it->w * wd->ratio / wd->dratio, it->h * wd->ratio / wd->dratio);
- elm_layout_content_set(obj, "swl.photo", eo);
- }
+ _imageslider_update_center_pos(wd, wd->move_x, wd->move_y, wd->y, wd->w);
}
+ else
+ {*/
+ _imageslider_update_pos(wd, wd->move_x, wd->y, wd->w);
+ //}
}
}
wd->move_cnt++;
Elm_Imageslider_Item *it;
- Evas_Coord ix, iy, iw, ih;
+ Evas_Coord ix = 0, iy = 0, iw = 0, ih = 0;
- double dx, dy = 0;
+ double dx = 0, dy = 0;
Eina_List *l[BLOCK_MAX];
Elm_Imageslider_Item *it;
- Evas_Coord ix, iy, iw, ih;
+ Evas_Coord ix = 0, iy = 0, iw = 0, ih = 0;
- double dx, dy = 0;
+ double dx = 0, dy = 0;
Evas_Object *eo = NULL;
eo = (Evas_Object*)elm_layout_content_get(wd->ly[BLOCK_CENTER], "swl.photo");
if (eo)
evas_object_geometry_get(eo, &ix, &iy, &iw, &ih);
- evas_object_geometry_get(eo, &ix, &iy, &iw, &ih);
edje_object_part_drag_value_get(elm_layout_edje_get(wd->ly[BLOCK_CENTER]), "swl.photo", &dx, &dy);
if ((iw != wd->w) || ((dx != 0) || (dy != 0)))
{
wd->on_zoom = EINA_TRUE;
- edje_object_signal_emit(elm_layout_edje_get(wd->ly[BLOCK_CENTER]), "block.off", "block");
+ //edje_object_signal_emit(elm_layout_edje_get(wd->ly[BLOCK_CENTER]), "block.off", "block");
}
else
{
int ret;
wd = data;
- if (wd->ani_lock == 0)
- return 0;
+ if (wd->ani_lock == EINA_FALSE)
+ return EINA_FALSE;
gettimeofday(&tv, NULL);
if (wd->move_x == wd->x)
{
- wd->ani_lock = 0;
+ wd->ani_lock = EINA_FALSE;
if (wd->cur)
{
it = eina_list_data_get(wd->cur);
ret = _check_drag(BLOCK_LEFT, wd);
ret = _check_drag(BLOCK_RIGHT, wd);
- _check_zoom(wd);
+ //_check_zoom(wd);
if (!wd->queue_idler)
wd->queue_idler = ecore_idler_add(_icon_to_image, wd);
return;
}
- wd->ani_lock = 1;
+ wd->ani_lock = EINA_TRUE;
w = wd->move_x;
gettimeofday(&wd->tv, NULL);
if (!eo)
{
eo = elm_image_add(wd->obj);
- elm_layout_content_set(wd->ly[i], "swl.photo", eo);
//elm_image_prescale_set(eo, wd->w);
elm_image_file_set(eo, it->photo_file, NULL);
- elm_image_object_size_get(eo, &it->w, &it->h);
- evas_object_geometry_get(eo, &it->ox, &it->oy, &it->ow, &it->oh);
- it->ow = it->w;
- it->oh = it->h;
elm_layout_content_set(wd->ly[i], "swl.photo", eo);
+ //elm_image_object_size_get(eo, &it->w, &it->h);
+ //evas_object_geometry_get(eo, &it->ox, &it->oy, &it->ow, &it->oh);
+ //it->ow = it->w;
+ //it->oh = it->h;
}
-
- if (wd->moving != it->moving)
+ /*if (wd->moving != it->moving)
{
it->moving = wd->moving;
if (wd->moving)
{
//elm_image_prescale_set(eo, it->w > it->h ? it->w : it->h);
}
- }
+ }*/
}
}
_anim(wd);
}
-/**
-* Add an Image Slider widget
-*
-* @param parent The parent object
-* @return The new Image slider object or NULL if it cannot be created
-*
-* @ingroup Imageslider
+/**
+* Add an Image Slider widget
+*
+* @param parent The parent object
+* @return The new Image slider object or NULL if it cannot be created
+*
+* @ingroup Imageslider
*/
EAPI Evas_Object *
elm_imageslider_add(Evas_Object *parent)
{
int i;
- Evas_Object *obj = NULL;
-
- Widget_Data *wd = NULL;
-
+ Evas_Object *obj;
Evas *e;
+ Widget_Data *wd;
- if (!parent)
- return NULL;
-
- wd = ELM_NEW(Widget_Data);
- e = evas_object_evas_get(parent);
- if (e == NULL) return NULL;
+ ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
- obj = elm_widget_add(e);
ELM_SET_WIDTYPE(widtype, "imageslider");
elm_widget_type_set(obj, "imageslider");
elm_widget_sub_object_add(parent, obj);
elm_widget_theme_hook_set(obj, _theme_hook);
wd->clip = evas_object_rectangle_add(e);
+ elm_widget_sub_object_add(obj, wd->clip);
elm_widget_resize_object_set(obj, wd->clip);
for (i = 0; i < BLOCK_MAX; i++)
return obj;
}
-/**
-* Append an Image Slider item
-*
-* @param obj The Image Slider object
-* @param photo_file photo file path
-* @param func callback function
-* @param data callback data
-* @return The Image Slider item handle or NULL
-*
-* @ingroup Imageslider
+/**
+* Append an Image Slider item
+*
+* @param obj The Image Slider object
+* @param photo_file photo file path
+* @param func callback function
+* @param data callback data
+* @return The Image Slider item handle or NULL
+*
+* @ingroup Imageslider
*/
EAPI Elm_Imageslider_Item *
elm_imageslider_item_append(Evas_Object *obj, const char *photo_file, Elm_Imageslider_Cb func, void *data)
/**
* Insert an Image Slider item into the Image Slider Widget by using the given index.
*
-* @param obj The Image Slider object
-* @param photo_file photo file path
-* @param func callback function
-* @param index required position
-* @param data callback data
-* @return The Image Slider item handle or NULL
+* @param obj The Image Slider object
+* @param photo_file photo file path
+* @param func callback function
+* @param index required position
+* @param data callback data
+* @return The Image Slider item handle or NULL
*
-* @ingroup Imageslider
+* @ingroup Imageslider
*/
EAPI Elm_Imageslider_Item *
elm_imageslider_item_append_relative(Evas_Object *obj, const char *photo_file, Elm_Imageslider_Cb func, unsigned int index, void *data)
return it;
}
-/**
-* Prepend Image Slider item
-*
-* @param obj The Image Slider object
-* @param photo_file photo file path
-* @param func callback function
-* @param data callback data
-* @return The imageslider item handle or NULL
-*
-* @ingroup Imageslider
+/**
+* Prepend Image Slider item
+*
+* @param obj The Image Slider object
+* @param photo_file photo file path
+* @param func callback function
+* @param data callback data
+* @return The imageslider item handle or NULL
+*
+* @ingroup Imageslider
*/
EAPI Elm_Imageslider_Item *
elm_imageslider_item_prepend(Evas_Object *obj, const char *photo_file, Elm_Imageslider_Cb func, void *data)
/**
* Delete the selected Image Slider item
*
-* @param it The selected Image Slider item handle
+* @param it The selected Image Slider item handle
*
* @ingroup Imageslider
*/
/**
* Get the selected Image Slider item
*
-* @param obj The Image Slider object
+* @param obj The Image Slider object
* @return The selected Image Slider item or NULL
*
* @ingroup Imageslider
/**
* Get whether an Image Slider item is selected or not
*
-* @param it the selected Image Slider item
+* @param it the selected Image Slider item
* @return EINA_TRUE or EINA_FALSE
*
* @ingroup Imageslider
/**
* Set the selected Image Slider item
*
-* @param it The Imaga Slider item
+* @param it The Imaga Slider item
*
* @ingroup Imageslider
*/
/**
* Get the photo file path of given Image Slider item
*
-* @param it The Image Slider item
+* @param it The Image Slider item
* @return The photo file path or NULL;
*
* @ingroup Imageslider
/**
* Get the previous Image Slider item
*
-* @param it The Image Slider item
+* @param it The Image Slider item
* @return The previous Image Slider item or NULL
*
* @ingroup Imageslider
/**
* Get the next Image Slider item
*
-* @param it The Image Slider item
+* @param it The Image Slider item
* @return The next Image Slider item or NULL
*
* @ingroup Imageslider
/**
* Move to the previous Image Slider item
*
-* @param obj The Image Slider object
+* @param obj The Image Slider object
*
* @ingroup Imageslider
*/
elm_imageslider_item_update(Elm_Imageslider_Item *it)
{
Widget_Data *wd;
- int i = 0;
if (!it || (!(wd = elm_widget_data_get(it->obj)))) return;
ELM_CHECK_WIDTYPE(it->obj, widtype);
+ if (wd->ani_lock == EINA_TRUE) return;
if (it == eina_list_data_get(eina_list_prev(wd->cur)))
elm_layout_content_set(wd->ly[BLOCK_LEFT], "swl.photo", NULL);
else if (it == eina_list_data_get(wd->cur))
elm_layout_content_set(wd->ly[BLOCK_CENTER], "swl.photo", NULL);
- else if (it == eina_list_data_get(eina_list_prev(wd->cur)))
+ else if (it == eina_list_data_get(eina_list_next(wd->cur)))
elm_layout_content_set(wd->ly[BLOCK_RIGHT], "swl.photo", NULL);
-
_imageslider_update(wd);
}
projects / framework / uifw / elementary.git / blobdiff