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

elementary/elm_photocam: change api name and add 'do_gesture' variable 

SVN revision: 68859
This commit is contained in:
Mikael SANS 2012-03-06 23:56:02 +00:00
parent 969e0b4c51
commit 44fa969639
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ my_bt_zoom_fill(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUS
static void
my_bt_gesture(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
elm_photocam_gesture_set(data, !elm_photocam_gesture_get(data));
elm_photocam_gesture_enabled_set(data, !elm_photocam_gesture_enabled_get(data));
}
static void

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

@ -98,6 +98,7 @@ struct _Widget_Data
Eina_Bool on_hold : 1;
Eina_Bool paused : 1;
Eina_Bool do_region : 1;
Eina_Bool do_gesture : 1;
Eina_Bool zoom_gest : 1;
};
@ -1925,12 +1926,12 @@ elm_photocam_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *
}
EAPI void
elm_photocam_gesture_set(Evas_Object *obj, Eina_Bool gesture)
elm_photocam_gesture_enabled_set(Evas_Object *obj, Eina_Bool gesture)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if ((wd->gest && !!gesture) || (!wd->gest && !gesture)) return;
if (wd->do_gesture == !!gesture) return;
if (wd->gest)
{
@ -1941,6 +1942,7 @@ elm_photocam_gesture_set(Evas_Object *obj, Eina_Bool gesture)
if (gesture)
{
wd->gest = elm_gesture_layer_add(wd->obj);
if (!wd->gest) return;
elm_gesture_layer_attach(wd->gest, wd->obj);
elm_gesture_layer_cb_set(wd->gest, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_START,
_gzoom_start, wd);
@ -1951,16 +1953,16 @@ elm_photocam_gesture_set(Evas_Object *obj, Eina_Bool gesture)
elm_gesture_layer_cb_set(wd->gest, ELM_GESTURE_ZOOM, ELM_GESTURE_STATE_ABORT,
_gzoom_end, wd);
}
wd->do_gesture = !!gesture;
}
EAPI Eina_Bool
elm_photocam_gesture_get(const Evas_Object *obj)
elm_photocam_gesture_enabled_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return EINA_FALSE;
if (wd->gest)
return EINA_TRUE;
return EINA_FALSE;
return wd->do_gesture;
}

6
legacy/elementary/src/lib/elm_photocam.h
View File

@ -263,7 +263,7 @@ EAPI void elm_photocam_bounce_get(const Evas_Object *obj, Eina
* This sets the gesture state to on(EINA_TRUE) or off (EINA_FALSE) for
* photocam. The default is off. This will start multi touch zooming.
*/
EAPI void elm_photocam_gesture_set(Evas_Object *obj, Eina_Bool gesture);
EAPI void elm_photocam_gesture_enabled_set(Evas_Object *obj, Eina_Bool gesture);
/**
* @brief Get the gesture state for photocam.
@ -273,9 +273,9 @@ EAPI void elm_photocam_gesture_set(Evas_Object *obj, Eina_Bool gesture);
*
* This gets the current gesture state for the photocam object.
*
* @see elm_photocam_gesture_set()
* @see elm_photocam_gesture_enabled_set()
*/
EAPI Eina_Bool elm_photocam_gesture_get(const Evas_Object *obj);
EAPI Eina_Bool elm_photocam_gesture_enabled_get(const Evas_Object *obj);
/**
* @}
*/