diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | data/themes/edc/elm/entry.edc | 1 | ||||
| -rw-r--r-- | src/lib/elm_entry.c | 11 |
3 files changed, 10 insertions, 6 deletions
@@ -1724,6 +1724,10 @@ * spinner: added signals "spinner,drag,start" and "spinner,drag,stop". +2013-10-27 Thiep Ha + + * entry: Correct magnifier showing. + 2013-10-30 Amitesh Singh (_ami_) * image: Add support for "clicked" callback on Return/space/KP_Enter key press. diff --git a/data/themes/edc/elm/entry.edc b/data/themes/edc/elm/entry.edc index 239287dca..620f73846 100644 --- a/data/themes/edc/elm/entry.edc +++ b/data/themes/edc/elm/entry.edc @@ -957,6 +957,7 @@ group { name: "elm/entry/magnifier/default"; scale: 1; description { state: "default" 0.0; min: 128 64; + align: 0 0; image.normal: "frame_rounded.png"; image.border: 14 14 14 14; image.middle: 0; diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 77ab8d959..9d2508ac5 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -1372,15 +1372,14 @@ _magnifier_move(void *data, Evas_Coord px, Evas_Coord py) Evas_Coord x, y, w, h; Evas_Coord ex, ey; Evas_Coord sx, sy; - const Evas_Object *obj_bg; + const Evas_Object *obj_content; double scale = _elm_config->magnifier_scale; - obj_bg = edje_object_part_object_get(sd->mgf_bg, "bg"); - evas_object_geometry_get(obj_bg, NULL, NULL, &w, &h); - evas_object_move(sd->mgf_bg, px - w/2, py - h); + edje_object_parts_extends_calc(sd->mgf_bg, &x, &y, &w, &h); + evas_object_move(sd->mgf_bg, px - x - w/2, py - y - h); - obj_bg = edje_object_part_object_get(sd->mgf_bg, "swallow"); - evas_object_geometry_get(obj_bg, &x, &y, &w, &h); + obj_content = edje_object_part_object_get(sd->mgf_bg, "elm.swallow.content"); + evas_object_geometry_get(obj_content, &x, &y, &w, &h); sx = px - (x + w/2); sy = py - (y + h/2); |