elementary: add ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN a new policy for zoom in elm_photocam

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@65958 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index c66d896..f55d3fd 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -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;
    /**

diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index a1d04a0..aed1d62 100644 (file)
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -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;