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

elementary: add ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN a new policy for zoom in elm_photocam 

SVN revision: 65958
This commit is contained in:
Michael BOUCHAUD 2011-12-06 15:11:59 +00:00
parent 65106b50ac
commit 17cdac8d95
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/elementary/src/lib/Elementary.h.in
View File

@ -22671,6 +22671,7 @@ extern "C" {
ELM_PHOTOCAM_ZOOM_MODE_MANUAL = 0, /**< Zoom controlled normally by elm_photocam_zoom_set */
ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT, /**< Zoom until photo fits in photocam */
ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL, /**< Zoom until photo fills photocam */
ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN, /**< Unzoom until photo fits in photocam */
ELM_PHOTOCAM_ZOOM_MODE_LAST
} Elm_Photocam_Zoom_Mode;
/**

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

@ -1293,6 +1293,40 @@ elm_photocam_zoom_set(Evas_Object *obj, double zoom)
wd->size.nh = ph;
}
}
else if (wd->mode == ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN)
{
if ((wd->size.imw < 1) || (wd->size.imh < 1))
{
wd->size.nw = 0;
wd->size.nh = 0;
}
else if ((wd->size.imw < rw) && (wd->size.imh < rh))
{
if (1 != wd->zoom) zoom_changed = 1;
wd->zoom = 1;
wd->size.nw = wd->size.imw;
wd->size.nh = wd->size.imh;
}
else
{
ph = (wd->size.imh * rw) / wd->size.imw;
if (ph > rh)
{
pw = (wd->size.imw * rh) / wd->size.imh;
ph = rh;
}
else
pw = rw;
if (wd->size.imw > wd->size.imh)
z = wd->size.imw / pw;
else
z = wd->size.imh / ph;
if (z != wd->zoom) zoom_changed = 1;
wd->zoom = z;
wd->size.nw = pw;
wd->size.nh = ph;
}
}
if (wd->main_load_pending)
{
wd->size.w = wd->size.nw;