summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorThiep Ha <thiepha@gmail.com>2013-11-08 16:08:47 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-11-08 16:10:48 +0900
commitd1cb9ecc4c59794882da274d4db04a09741d0280 (patch)
tree898a0d2fdcbc454ba8396e98f47e55b5bbd59211 /src/lib
parent1cb8711168a9b5225ed9f017098272eb02ac39f0 (diff)
elm_entry: fix magnifier not showing up.
The swallow part was properly renamed and namespaced, so reflect that in the code. Also force a edje object recalc before moving the magnifier. Reviewers: raster, cedric, Hermet, tasn Reviewed By: cedric CC: seoz Differential Revision: https://phab.enlightenment.org/D286 Signed-off-by: Cedric Bail <cedric.bail@samsung.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elm_entry.c11
1 files changed, 5 insertions, 6 deletions
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)
1372 Evas_Coord x, y, w, h; 1372 Evas_Coord x, y, w, h;
1373 Evas_Coord ex, ey; 1373 Evas_Coord ex, ey;
1374 Evas_Coord sx, sy; 1374 Evas_Coord sx, sy;
1375 const Evas_Object *obj_bg; 1375 const Evas_Object *obj_content;
1376 double scale = _elm_config->magnifier_scale; 1376 double scale = _elm_config->magnifier_scale;
1377 1377
1378 obj_bg = edje_object_part_object_get(sd->mgf_bg, "bg"); 1378 edje_object_parts_extends_calc(sd->mgf_bg, &x, &y, &w, &h);
1379 evas_object_geometry_get(obj_bg, NULL, NULL, &w, &h); 1379 evas_object_move(sd->mgf_bg, px - x - w/2, py - y - h);
1380 evas_object_move(sd->mgf_bg, px - w/2, py - h);
1381 1380
1382 obj_bg = edje_object_part_object_get(sd->mgf_bg, "swallow"); 1381 obj_content = edje_object_part_object_get(sd->mgf_bg, "elm.swallow.content");
1383 evas_object_geometry_get(obj_bg, &x, &y, &w, &h); 1382 evas_object_geometry_get(obj_content, &x, &y, &w, &h);
1384 sx = px - (x + w/2); 1383 sx = px - (x + w/2);
1385 sy = py - (y + h/2); 1384 sy = py - (y + h/2);
1386 1385