[EGIT] [apps/ephoto] master 01/01: Ephoto: Escape cancels cropping, Return applies crop.

[Stephen Houston]

okra pushed a commit to branch master.

http://git.enlightenment.org/apps/ephoto.git/commit/?id=6cce9a1e9e9ed472e340ad068920a903b6089f5d

commit 6cce9a1e9e9ed472e340ad068920a903b6089f5d
Author: Stephen Houston <smhousto...@gmail.com>
Date:   Tue Mar 3 15:06:02 2015 -0600

    Ephoto: Escape cancels cropping, Return applies crop.
---
 src/bin/ephoto_cropper.c        |  2 --
 src/bin/ephoto_single_browser.c | 13 +++++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/bin/ephoto_cropper.c b/src/bin/ephoto_cropper.c
index 5e62574..5c9111e 100644
--- a/src/bin/ephoto_cropper.c
+++ b/src/bin/ephoto_cropper.c
@@ -138,7 +138,6 @@ _cropper_resize_horiz(void *data, Evas_Object *obj 
EINA_UNUSED, const char *emis
    ec->startx = mx;
    ec->starty = my;
 
-
    edje_object_signal_callback_add(ec->cropper, "mouse,move", source, 
_cropper_horiz_mouse_move, ec);
    edje_object_signal_callback_add(ec->cropper, "mouse,up,1", source, 
_cropper_horiz_mouse_up, ec);
 }
@@ -224,7 +223,6 @@ _cropper_mouse_move(void *data, Evas_Object *obj 
EINA_UNUSED, const char *emissi
         else if (my > ly+lh)
           my = ly+lh;
 
-
         nx = mx-ec->startx;
         ny = my-ec->starty;
         ec->startx = mx;
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index f0ec351..833ebe6 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -1293,12 +1293,21 @@ _key_down(void *data, Evas *e EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED, void *e
              if (shift) _zoom_fit(sb);
              else _zoom_set(sb, 1.0);
           }
-
         return;
      }
 
    if (!strcmp(k, "Escape"))
-     evas_object_smart_callback_call(sb->main, "back", sb->entry);
+     {
+        if (sb->cropping)
+          _cancel_crop(sb, NULL, NULL);
+        else
+          evas_object_smart_callback_call(sb->main, "back", sb->entry);
+     }
+   else if (!strcmp(k, "Return"))
+     {
+        if (sb->cropping)
+          _apply_crop(sb, NULL, NULL);
+     }
    else if (!strcmp(k, "Left"))
      _prev_entry(sb);
    else if (!strcmp(k, "Right"))

--