enlightenment/ephoto
enlightenment
/
ephoto
7
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Ephoto: Spec file fix, rid of unused variables.

This commit is contained in:
Stephen Houston 2015-02-20 21:08:25 -06:00
parent f670969435
commit a55ffcc290
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/themes/crop.edc
View File

@ -95,17 +95,21 @@ collections {
set_state_val(PART:"ephoto.swallow.cropper", STATE_REL2_OFFSET, ppox, ppoy); set_state_val(PART:"ephoto.swallow.cropper", STATE_REL2_OFFSET, ppox, ppoy);
} }
if (movetype == 9) { if (movetype == 9) {
new ppox, ppoy, oldw, oldh, scalew, scaleh; new ppox, ppoy;
get_state_val(PART:"ephoto.swallow.cropper", STATE_REL1_OFFSET, pox, poy); get_state_val(PART:"ephoto.swallow.cropper", STATE_REL1_OFFSET, pox, poy);
get_state_val(PART:"ephoto.swallow.cropper", STATE_REL2_OFFSET, ppox, ppoy); get_state_val(PART:"ephoto.swallow.cropper", STATE_REL2_OFFSET, ppox, ppoy);
oldw = cw + cox; if (cx < ix)
oldh = ch + coy; cox = ix-cx;
scalew = oldw/cw; if (cx+cw > ix+iw)
scaleh = oldh/ch; cox = (ix+iw)-(cx+cw);
pox *= scalew; if (cy < iy)
ppox *= scalew; coy = iy-cy;
poy *= scaleh; if (cy+ch > iy+ih)
ppoy *= scaleh; coy = (iy+ih)-(cy+ch);
pox += cox;
ppox += cox;
poy += coy;
ppoy += coy;
set_state_val(PART:"ephoto.swallow.cropper", STATE_REL1_OFFSET, pox, poy); set_state_val(PART:"ephoto.swallow.cropper", STATE_REL1_OFFSET, pox, poy);
set_state_val(PART:"ephoto.swallow.cropper", STATE_REL2_OFFSET, ppox, ppoy); set_state_val(PART:"ephoto.swallow.cropper", STATE_REL2_OFFSET, ppox, ppoy);
} }

2
ephoto.spec.in
View File

@ -4,7 +4,7 @@ Version: @VERSION@
Release: 0.%(date '+%Y%m%d') Release: 0.%(date '+%Y%m%d')
License: BSD License: BSD
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.stephen.3sixty8.com URL: http://www.smhouston.us
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
Packager: %{?_packager:%{_packager}}%{!?_packager:Stephen Houston <smhouston88@gmail.com>} Packager: %{?_packager:%{_packager}}%{!?_packager:Stephen Houston <smhouston88@gmail.com>}
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:Okra Project (http://www.smhouston.us/)} Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:Okra Project (http://www.smhouston.us/)}

7
src/bin/ephoto_cropper.c
View File

@ -271,8 +271,7 @@ _image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
Ephoto_Cropper *ec = data; Ephoto_Cropper *ec = data;
Edje_Message_Int_Set *msg; Edje_Message_Int_Set *msg;
int sx, sy, sw, sh, iw, ih, diffw, diffh; int sx, sy, sw, sh, ix, iy, iw, ih, diffw, diffh;
int cx, cy, cw, ch, ix, iy;
evas_object_geometry_get(ec->layout, &sx, &sy, &sw, &sh); evas_object_geometry_get(ec->layout, &sx, &sy, &sw, &sh);
evas_object_image_size_get(elm_image_object_get(ec->image), &iw, &ih); evas_object_image_size_get(elm_image_object_get(ec->image), &iw, &ih);
@ -310,10 +309,6 @@ _image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
diffh /= 2; diffh /= 2;
ix = sx+diffw; ix = sx+diffw;
iy = sy+diffh; iy = sy+diffh;
cw = nw/2;
ch = nh/2;
cx = ix+(cw/2);
cy = iy+(ch/2);
evas_object_resize(ec->layout, nw, nh); evas_object_resize(ec->layout, nw, nh);
evas_object_move(ec->layout, ix, iy); evas_object_move(ec->layout, ix, iy);