Ephoto: Escape cancels cropping, Return applies crop.
This commit is contained in:
parent
52e8576d9c
commit
6cce9a1e9e
|
@ -138,7 +138,6 @@ _cropper_resize_horiz(void *data, Evas_Object *obj EINA_UNUSED, const char *emis
|
||||||
ec->startx = mx;
|
ec->startx = mx;
|
||||||
ec->starty = my;
|
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,move", source, _cropper_horiz_mouse_move, ec);
|
||||||
edje_object_signal_callback_add(ec->cropper, "mouse,up,1", source, _cropper_horiz_mouse_up, 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)
|
else if (my > ly+lh)
|
||||||
my = ly+lh;
|
my = ly+lh;
|
||||||
|
|
||||||
|
|
||||||
nx = mx-ec->startx;
|
nx = mx-ec->startx;
|
||||||
ny = my-ec->starty;
|
ny = my-ec->starty;
|
||||||
ec->startx = mx;
|
ec->startx = mx;
|
||||||
|
|
|
@ -1293,12 +1293,21 @@ _key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
|
||||||
if (shift) _zoom_fit(sb);
|
if (shift) _zoom_fit(sb);
|
||||||
else _zoom_set(sb, 1.0);
|
else _zoom_set(sb, 1.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strcmp(k, "Escape"))
|
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"))
|
else if (!strcmp(k, "Left"))
|
||||||
_prev_entry(sb);
|
_prev_entry(sb);
|
||||||
else if (!strcmp(k, "Right"))
|
else if (!strcmp(k, "Right"))
|
||||||
|
|
Loading…
Reference in New Issue