forked from enlightenment/efl
Fix elm_photocam API and cnp documentation.
Signed-off-by: Sanjeev BA <eflelev8@gmail.com> SVN revision: 68373
This commit is contained in:
parent
cb31e1367d
commit
8a496e93ab
|
@ -74,7 +74,7 @@ static void
|
|||
_fit(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
int x, y, w, h;
|
||||
elm_photocam_region_get(data, &x, &y, &w, &h);
|
||||
elm_photocam_image_region_get(data, &x, &y, &w, &h);
|
||||
printf("region: {%d, %d, %d, %d}\n", x, y, w, h);
|
||||
elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT);
|
||||
}
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
/**
|
||||
* @defgroup CopyPaste
|
||||
* @defgroup CopyPaste CopyPaste
|
||||
*
|
||||
* Implement the copy and paste + clipboard functionality, in order to
|
||||
* share data across application windows.
|
||||
* Implement the following functionality
|
||||
* a. select, copy/cut and paste
|
||||
* b. clipboard
|
||||
* c. drag and drop
|
||||
* in order to share data across application windows.
|
||||
*
|
||||
* Contains functions to select a portion of text, stick it to a clipboard
|
||||
* and to paste the selection to an appropriate place.
|
||||
*
|
||||
*
|
||||
*
|
||||
* @{
|
||||
*/
|
||||
|
||||
|
@ -42,7 +43,7 @@ typedef enum
|
|||
ELM_SEL_FORMAT_IMAGE = 0x04,
|
||||
/** Vcards */
|
||||
ELM_SEL_FORMAT_VCARD = 0x08,
|
||||
/** Raw HTML-like things for widgets that want that stuff (hello webkit!) */
|
||||
/** Raw HTML-like data (ex., webkit) */
|
||||
ELM_SEL_FORMAT_HTML = 0x10,
|
||||
} Elm_Sel_Format;
|
||||
|
||||
|
@ -72,7 +73,7 @@ typedef Eina_Bool (*Elm_Drop_Cb)(void *d, Evas_Object *o, Elm_Selection_Data *da
|
|||
* @brief Set copy and paste data to a widget.
|
||||
*
|
||||
* XXX: need to be rewritten.
|
||||
* Append the given callback to the list. This functions will be called.
|
||||
* Append the given callback to the list.
|
||||
*
|
||||
* @param selection Selection type for copying and pasting
|
||||
* @param obj The source widget pointer
|
||||
|
|
|
@ -4550,6 +4550,19 @@ EINA_DEPRECATED EAPI void elm_all_flush(void);
|
|||
*/
|
||||
EINA_DEPRECATED EAPI void elm_video_uri_set(Evas_Object *video, const char *uri);
|
||||
|
||||
/**
|
||||
* @brief Get the region of the image that is currently shown
|
||||
*
|
||||
* @param obj
|
||||
* @param x A pointer to the X-coordinate of region
|
||||
* @param y A pointer to the Y-coordinate of region
|
||||
* @param w A pointer to the width
|
||||
* @param h A pointer to the height
|
||||
*
|
||||
* @deprecated Use elm_photocam_image_region_get() instead.
|
||||
*/
|
||||
EINA_DEPRECATED EAPI void elm_photocam_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
|
|
@ -1468,8 +1468,14 @@ elm_photocam_image_size_get(const Evas_Object *obj, int *w, int *h)
|
|||
if (h) *h = wd->size.imh;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
EINA_DEPRECATED EAPI void
|
||||
elm_photocam_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h)
|
||||
{
|
||||
return elm_photocam_image_region_get(obj, x, y, w, h);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
elm_photocam_image_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h)
|
||||
{
|
||||
ELM_CHECK_WIDTYPE(obj, widtype);
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
|
|
@ -169,7 +169,7 @@ EAPI void elm_photocam_image_size_get(const Evas_Object *obj,
|
|||
* @see elm_photocam_image_region_show()
|
||||
* @see elm_photocam_image_region_bring_in()
|
||||
*/
|
||||
EAPI void elm_photocam_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
|
||||
EAPI void elm_photocam_image_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
|
||||
|
||||
/**
|
||||
* @brief Set the viewed region of the image
|
||||
|
|
Loading…
Reference in New Issue