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

Elm gesture layer: Added a test for the gesture layer widget. 

SVN revision: 61119
This commit is contained in:
Tom Hacohen 2011-07-07 14:41:10 +00:00
parent 74d7906e61
commit 8d20563055
9 changed files with 381 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/elementary/data/images/Makefile.am
View File

@ -5,6 +5,9 @@ filesdir = $(datadir)/elementary/images
files_DATA = \
panel_01.jpg \
plant_01.jpg \
pol_shadow.png \
pol_sky.png \
pol_twofish.png \
rock_01.jpg \
rock_02.jpg \
sky_01.jpg \

BIN
legacy/elementary/data/images/pol_shadow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
legacy/elementary/data/images/pol_sky.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 119 KiB

BIN
legacy/elementary/data/images/pol_twofish.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 KiB

8
legacy/elementary/data/objects/Makefile.am
View File

@ -9,7 +9,7 @@ EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/objects -fd $(top_srcdir)
filesdir = $(datadir)/elementary/objects
files_DATA = test.edj multip.edj colorpreview.edj cursors.edj font_preview.edj
files_DATA = test.edj multip.edj colorpreview.edj cursors.edj font_preview.edj postit_ent.edj
EXTRA_DIST = \
test.edc \
@ -17,6 +17,7 @@ multip.edc \
colorpreview.edc \
cursors.edc \
font_preview.edc \
postit_ent.edc \
grid_bg.png \
over.png \
under.png \
@ -49,5 +50,10 @@ font_preview.edj: Makefile $(EXTRA_DIST)
$(top_srcdir)/data/objects/font_preview.edc \
$(top_builddir)/data/objects/font_preview.edj
postit_ent.edj: Makefile $(EXTRA_DIST)
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/objects/postit_ent.edc \
$(top_builddir)/data/objects/postit_ent.edj
clean-local:
rm -f *.edj

26
legacy/elementary/data/objects/postit_ent.edc Normal file
View File

@ -0,0 +1,26 @@
collections {
group {
name: "main";
images {
// image: "1.png" COMP;
}
parts {
part {
name: "bg";
type: RECT;
description {
state: "default" 0.0;
color: 247 239 132 255;
}
}
part {
name: "ent";
type: SWALLOW;
description {
state: "default" 0.0;
}
}
}
}
}

1
legacy/elementary/src/bin/Makefile.am
View File

@ -64,6 +64,7 @@ test_focus.c \
test_gengrid.c \
test_genlist.c \
test_genscroller.c \
test_gesture_layer.c \
test_glview_simple.c \
test_glview.c \
test_grid.c \

2
legacy/elementary/src/bin/test.c
View File

@ -71,6 +71,7 @@ void test_genlist9(void *data, Evas_Object *obj, void *event_info);
void test_genlist10(void *data, Evas_Object *obj, void *event_info);
void test_genlist11(void *data, Evas_Object *obj, void *event_info);
void test_genscroller(void *data, Evas_Object *obj, void *event_info);
void test_gesture_layer(void *data, Evas_Object *obj, void *event_info);
void test_table(void *data, Evas_Object *obj, void *event_info);
void test_table2(void *data, Evas_Object *obj, void *event_info);
void test_table3(void *data, Evas_Object *obj, void *event_info);
@ -414,6 +415,7 @@ my_win_main(char *autorun)
ADD_TEST("GLView", test_glview);
ADD_TEST("3D", test_3d);
ADD_TEST("Genscroller", test_genscroller);
ADD_TEST("Gesture Layer", test_gesture_layer);
#undef ADD_TEST
if (autorun)

342
legacy/elementary/src/bin/test_gesture_layer.c Normal file
View File

@ -0,0 +1,342 @@
#include <Elementary.h>
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#ifndef ELM_LIB_QUICKLAUNCH
/* We zoom out to this value so we'll be able to use map and have a nice
* resolution when zooming in. */
#define BASE_ZOOM 0.5
/* The amount of zoom to do when "lifting" objects. */
#define LIFT_FACTOR 1.3
/* The base size of the shadow image. */
#define SHADOW_W 118
#define SHADOW_H 118
#define RAD2DEG(x) ((x) * 57.295779513)
static double zoom_out_animation_duration = 0.4;
struct _Photo_Object {
Evas_Object *ic, *shadow;
Evas_Object *hit;
Evas_Object *gl;
Elm_Animator *zoom_out;
/* bx, by - current wanted coordinates of the photo object.
* bw, bh - original size of the "ic" object.
* dx, dy - Used to indicate the distance between the center point
* where we put down our fingers (when started moving the item) to
* the coords of the object, so we'll be able to calculate movement
* correctly. */
Evas_Coord bx, by, bw, bh, dx, dy;
/* Because gesture layer only knows the amount of rotation/zoom we do
* per gesture, we have to keep the current rotate/zoom factor and the
* one that was before we started the gesture. */
int base_rotate, rotate;
double base_zoom, zoom;
double shadow_zoom;
};
typedef struct _Photo_Object Photo_Object;
/* This function applies the information from the Photo_Object to the actual
* evas objects. Zoom/rotate factors and etc. */
static void
apply_changes(Photo_Object *po)
{
Evas_Map *map;
map = evas_map_new(4);
evas_map_point_coord_set(map, 0, po->bx, po->by, 0);
evas_map_point_coord_set(map, 1, po->bx + po->bw, po->by, 0);
evas_map_point_coord_set(map, 2, po->bx + po->bw, po->by + po->bh, 0);
evas_map_point_coord_set(map, 3, po->bx, po->by + po->bh, 0);
evas_map_point_image_uv_set(map, 0, 0, 0);
evas_map_point_image_uv_set(map, 1, po->bw, 0);
evas_map_point_image_uv_set(map, 2, po->bw, po->bh);
evas_map_point_image_uv_set(map, 3, 0, po->bh);
evas_map_util_rotate(map, po->rotate,
po->bx + po->bw / 2, po->by + po->bh /2);
evas_map_util_zoom(map, po->zoom, po->zoom,
po->bx + po->bw / 2, po->by + po->bh /2);
evas_object_map_enable_set(po->ic, EINA_TRUE);
evas_object_map_set(po->ic, map);
{
Evas_Map *shadow_map = evas_map_new(4);
evas_map_point_coord_set(shadow_map, 0, po->bx, po->by, 0);
evas_map_point_coord_set(shadow_map, 1, po->bx + po->bw, po->by, 0);
evas_map_point_coord_set(shadow_map, 2, po->bx + po->bw, po->by + po->bh, 0);
evas_map_point_coord_set(shadow_map, 3, po->bx, po->by + po->bh, 0);
evas_map_point_image_uv_set(shadow_map, 0, 0, 0);
evas_map_point_image_uv_set(shadow_map, 1, SHADOW_W, 0);
evas_map_point_image_uv_set(shadow_map, 2, SHADOW_W, SHADOW_H);
evas_map_point_image_uv_set(shadow_map, 3, 0, SHADOW_H);
evas_map_util_rotate(shadow_map, po->rotate,
po->bx + po->bw / 2, po->by + po->bh /2);
evas_map_util_zoom(shadow_map, po->zoom * po->shadow_zoom,
po->zoom * po->shadow_zoom,
po->bx + (po->bw / 2), po->by + (po->bh / 2));
evas_object_map_enable_set(po->shadow, EINA_TRUE);
evas_object_map_set(po->shadow, shadow_map);
evas_map_free(shadow_map);
}
/* Update the position of the hit box */
{
Evas_Coord minx, miny, maxx, maxy;
int i;
evas_object_polygon_points_clear(po->hit);
evas_map_point_coord_get(map, 0, &minx, &miny, NULL);
maxx = minx;
maxy = miny;
evas_object_polygon_point_add(po->hit, minx, miny);
for (i = 1 ; i <= 3 ; i++)
{
Evas_Coord x, y;
evas_map_point_coord_get(map, i, &x, &y, NULL);
evas_object_polygon_point_add(po->hit, x, y);
if (x < minx)
minx = x;
else if (x > maxx)
maxx = x;
if (y < miny)
miny = y;
else if (y > maxy)
maxy = y;
}
}
evas_object_raise(po->shadow);
evas_object_raise(po->ic);
evas_object_raise(po->hit);
evas_map_free(map);
}
/* Zoom out animation */
static void
zoom_out_animation_operation(void *_po, Elm_Animator *animator __UNUSED__,
double frame)
{
Photo_Object *po = (Photo_Object *) _po;
po->zoom = BASE_ZOOM + ((po->base_zoom - BASE_ZOOM) * (1.0 - frame));
apply_changes(po);
}
static void
zoom_out_animation_end(void *_po)
{
Photo_Object *po = (Photo_Object *) _po;
po->base_zoom = po->zoom = BASE_ZOOM;
apply_changes(po);
elm_animator_del(po->zoom_out);
po->zoom_out = NULL;
}
static Evas_Event_Flags
rotate_move(void *_po, void *event_info)
{
Photo_Object *po = (Photo_Object *) _po;
Elm_Gesture_Rotate_Info *p = (Elm_Gesture_Rotate_Info *) event_info;
printf("rotate move <%d,%d> base=<%f> <%f>\n", p->x, p->y, RAD2DEG(p->base_angle), RAD2DEG(p->angle));
po->rotate = po->base_rotate + (int) RAD2DEG(p->base_angle - p->angle);
if (po->rotate < 0)
po->rotate += 360;
apply_changes(po);
return EVAS_EVENT_FLAG_NONE;
}
static Evas_Event_Flags
rotate_end(void *_po, void *event_info)
{
Photo_Object *po = (Photo_Object *) _po;
Elm_Gesture_Rotate_Info *p = (Elm_Gesture_Rotate_Info *) event_info;
printf("rotate end/abort <%d,%d> base=<%f> <%f>\n", p->x, p->y, RAD2DEG(p->base_angle), RAD2DEG(p->angle));
po->base_rotate += (int) RAD2DEG(p->base_angle - p->angle);
if (po->rotate < 0)
po->rotate += 360;
return EVAS_EVENT_FLAG_NONE;
}
static Evas_Event_Flags
zoom_start(void *_po, void *event_info)
{
Photo_Object *po = (Photo_Object *) _po;
Elm_Gesture_Zoom_Info *p = (Elm_Gesture_Zoom_Info *) event_info;
printf("zoom start <%d,%d> <%f>\n", p->x, p->y, p->zoom);
/* If there's an active animator, stop it */
if (po->zoom_out)
{
elm_animator_del(po->zoom_out);
po->zoom_out = NULL;
}
po->dx = p->x - po->bx;
po->dy = p->y - po->by;
/* Give it a "lift" effect right from the start */
po->base_zoom = BASE_ZOOM * LIFT_FACTOR;
po->zoom = po->base_zoom;
po->shadow_zoom = 1.7;
apply_changes(po);
return EVAS_EVENT_FLAG_NONE;
}
static Evas_Event_Flags
zoom_move(void *_po, void *event_info)
{
Photo_Object *po = (Photo_Object *) _po;
Elm_Gesture_Zoom_Info *p = (Elm_Gesture_Zoom_Info *) event_info;
printf("zoom move <%d,%d> <%f>\n", p->x, p->y, p->zoom);
po->zoom = po->base_zoom * p->zoom;
po->bx = p->x - po->dx;
po->by = p->y - po->dy;
apply_changes(po);
return EVAS_EVENT_FLAG_NONE;
}
static Evas_Event_Flags
zoom_end(void *_po, void *event_info)
{
Photo_Object *po = (Photo_Object *) _po;
Elm_Gesture_Zoom_Info *p = (Elm_Gesture_Zoom_Info *) event_info;
printf("zoom end/abort <%d,%d> <%f>\n", p->x, p->y, p->zoom);
/* Make sure middle is in the screen, if not, fix it. */
{
/* FIXME: Use actual window sizes instead of the hardcoded
* values */
Evas_Coord mx, my;
mx = po->bx + (po->bw / 2);
my = po->by + (po->bh / 2);
if (mx < 0)
po->bx = 0 - (po->bw / 2);
else if (mx > 480)
po->bx = 480 - (po->bw / 2);
if (my < 0)
po->by = 0 - (po->bw / 2);
else if (my > 800)
po->by = 800 - (po->bh / 2);
}
/* Apply the zoom out animator */
po->shadow_zoom = 1.3;
po->base_zoom = po->zoom;
po->zoom_out = elm_animator_add(po->ic);
elm_animator_duration_set(po->zoom_out, zoom_out_animation_duration);
elm_animator_curve_style_set(po->zoom_out, ELM_ANIMATOR_CURVE_LINEAR);
elm_animator_operation_callback_set(po->zoom_out,
zoom_out_animation_operation, po);
elm_animator_completion_callback_set(po->zoom_out,
zoom_out_animation_end, po);
elm_animator_animate(po->zoom_out);
return EVAS_EVENT_FLAG_NONE;
}
Photo_Object *
photo_object_add(Evas_Object *parent, Evas_Object *ic, const char *icon, Evas_Coord x,
Evas_Coord y, Evas_Coord w, Evas_Coord h, int angle)
{
Photo_Object *po;
po = calloc(1, sizeof(*po));
po->base_zoom = po->zoom = BASE_ZOOM;
if (ic)
{
po->ic = ic;
}
else
{
po->ic = elm_icon_add(parent);
elm_icon_file_set(po->ic, icon, NULL);
}
po->bx = x;
po->by = y;
po->bw = w;
po->bh = h;
/* Add shadow */
{
po->shadow = elm_icon_add(po->ic);
elm_icon_file_set(po->shadow, PACKAGE_DATA_DIR "/images/pol_shadow.png", NULL);
evas_object_resize(po->shadow, SHADOW_W, SHADOW_H);
evas_object_show(po->shadow);
}
po->hit = evas_object_polygon_add(evas_object_evas_get(parent));
evas_object_precise_is_inside_set(po->hit, EINA_TRUE);
evas_object_repeat_events_set(po->hit, EINA_TRUE);
evas_object_color_set(po->hit, 0, 0, 0, 0);
evas_object_resize(po->ic, po->bw, po->bh);
evas_object_show(po->ic);
evas_object_show(po->hit);
po->gl = elm_gesture_layer_add(po->ic);
elm_gesture_layer_hold_events_set(po->gl, EINA_TRUE);
elm_gesture_layer_attach(po->gl, po->hit);
/* FIXME: Add a po->rotate start so we take the first angle!!!! */
elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ROTATE, ELM_GESTURE_STATE_MOVE, rotate_move, po);
elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ROTATE, ELM_GESTURE_STATE_END, rotate_end, po);
elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ROTATE, ELM_GESTURE_STATE_ABORT, rotate_end, po);
elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_START, zoom_start, po);
elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_MOVE, zoom_move, po);
elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_END, zoom_end, po);
elm_gesture_layer_cb_set(po->gl, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_ABORT, zoom_end, po);
po->rotate = po->base_rotate = angle;
po->shadow_zoom = 1.3;
apply_changes(po);
return po;
}
void
test_gesture_layer(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
Evas_Coord w, h;
Evas_Object *win, *bg;
w = 480;
h = 800;
win = elm_win_add(NULL, "gesture-layer", ELM_WIN_BASIC);
elm_win_title_set(win, "Gesture Layer");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, w, h);
bg = elm_bg_add(win);
elm_bg_file_set(bg, PACKAGE_DATA_DIR "/images/wood_01.jpg", NULL);
elm_win_resize_object_add(win, bg);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(bg);
photo_object_add(win, NULL, PACKAGE_DATA_DIR "/images/pol_sky.png", 200, 200, 365, 400, 0);
photo_object_add(win, NULL, PACKAGE_DATA_DIR "/images/pol_twofish.png", 40, 300, 365, 400, 45);
Evas_Object *en = elm_entry_add(win);
elm_entry_entry_set(en, "You can use whatever object you want, "
"even entries like this.");
elm_entry_line_wrap_set(en, ELM_WRAP_MIXED);
Evas_Object *postit = elm_layout_add(win);
elm_layout_file_set(postit, PACKAGE_DATA_DIR "/objects/postit_ent.edj", "main");
elm_layout_content_set(postit, "ent", en);
photo_object_add(win, postit, NULL, 50, 50, 382, 400, 355);
evas_object_show(win);
}
#endif