From ab23a5309490d726fe6299b3c4a24c4938baf75f Mon Sep 17 00:00:00 2001
From: Jaeun Choi <jaeun12.choi@samsung.com>
Date: Fri, 27 May 2016 20:58:25 +0900
Subject: [PATCH] elm_image: add a new eo property 'align' and implement
 related functions

previously, elm_image refered to align values
set by evas_object_size_hint_align_set function
to position the internal image inside an image object.
size hint value is for positioning the image object inside its container object,
so the previous code is inappropriate.
this commit adds 'align' property for positioning the internal image.
---
 src/lib/elementary/elm_image.c        | 43 ++++++++++++++++++++-------
 src/lib/elementary/elm_image.eo       | 15 +++++++++-
 src/lib/elementary/elm_widget_image.h |  1 +
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/lib/elementary/elm_image.c b/src/lib/elementary/elm_image.c
index 7e920597f0..2da4ff1b09 100644
--- a/src/lib/elementary/elm_image.c
+++ b/src/lib/elementary/elm_image.c
@@ -123,7 +123,7 @@ _img_new(Evas_Object *obj)
 }
 
 static void
-_elm_image_internal_sizing_eval(Evas_Object *obj, Elm_Image_Data *sd)
+_elm_image_internal_sizing_eval(Evas_Object *obj EINA_UNUSED, Elm_Image_Data *sd)
 {
    if (!sd->img) return;
 
@@ -139,7 +139,6 @@ _elm_image_internal_sizing_eval(Evas_Object *obj, Elm_Image_Data *sd)
      {
         Evas_Coord x = 0, y = 0, w = 1, h = 1;
 
-        double alignh = 0.5, alignv = 0.5;
         int iw = 0, ih = 0, offset_x = 0, offset_y = 0;
 
         //1. Get the original image size (iw x ih)
@@ -199,14 +198,8 @@ _elm_image_internal_sizing_eval(Evas_Object *obj, Elm_Image_Data *sd)
           }
 
         //3. Calculate offset according to align value
-        evas_object_size_hint_align_get
-           (obj, &alignh, &alignv);
-
-        if (alignh == EVAS_HINT_FILL) alignh = 0.5;
-        if (alignv == EVAS_HINT_FILL) alignv = 0.5;
-
-        offset_x = ((sd->img_w - w) * alignh);
-        offset_y = ((sd->img_h - h) * alignv);
+        offset_x = ((sd->img_w - w) * sd->align_x);
+        offset_y = ((sd->img_h - h) * sd->align_y);
 
         x = sd->img_x + offset_x;
         y = sd->img_y + offset_y;
@@ -609,6 +602,8 @@ _elm_image_evas_object_smart_add(Eo *obj, Elm_Image_Data *priv)
    priv->scale = 1.0;
    priv->scale_up = EINA_TRUE;
    priv->scale_down = EINA_TRUE;
+   priv->align_x = 0.5;
+   priv->align_y = 0.5;
    eina_spinlock_new(&priv->async.lck);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -1466,6 +1461,34 @@ _elm_image_scalable_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, Eina_Bool *scal
    if (scale_down) *scale_down = sd->scale_down;
 }
 
+EOLIAN static void
+_elm_image_align_set(Eo *obj, Elm_Image_Data *sd, double align_x, double align_y)
+{
+   if (align_x > 1.0)
+     align_x = 1.0;
+   else if (align_x < 0.0)
+     align_x = 0.0;
+
+   if (align_y > 1.0)
+     align_y = 1.0;
+   else if (align_y < 0.0)
+     align_y = 0.0;
+
+   if ((align_x == sd->align_x) && (align_y == sd->align_y)) return;
+
+   sd->align_x = align_x;
+   sd->align_y = align_y;
+
+   _elm_image_internal_sizing_eval(obj, sd);
+}
+
+EOLIAN static void
+_elm_image_align_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, double *align_x, double *align_y)
+{
+   if (align_x) *align_x = sd->align_x;
+   if (align_y) *align_y = sd->align_y;
+}
+
 // A11Y
 
 EOLIAN static void
diff --git a/src/lib/elementary/elm_image.eo b/src/lib/elementary/elm_image.eo
index 37975e2ade..e03591dc49 100644
--- a/src/lib/elementary/elm_image.eo
+++ b/src/lib/elementary/elm_image.eo
@@ -83,7 +83,20 @@ class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
                                 if $false, the internal image is not scaled down
                                 no matter what the scale type is.]]
          }
-		}
+      }
+      @property align {
+         [[Control how the internal image is positioned inside an image object.
+
+           @since 1.18]]
+         set {
+         }
+         get {
+         }
+         values {
+            align_x: double; [[Alignment in the horizontal axis (0 <= align_x <= 1).]]
+            align_y: double; [[Alignment in the vertical axis (0 <= align_y <= 1).]]
+         }
+      }
       @property icon {
          set {
             [[Set the image by icon standards names.
diff --git a/src/lib/elementary/elm_widget_image.h b/src/lib/elementary/elm_widget_image.h
index e0ece1a445..fc219b9690 100644
--- a/src/lib/elementary/elm_widget_image.h
+++ b/src/lib/elementary/elm_widget_image.h
@@ -54,6 +54,7 @@ struct _Elm_Image_Data
 
    double                scale;
    double                frame_duration;
+   double                align_x, align_y;
 
    Evas_Coord            img_x, img_y, img_w, img_h;