cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d1cb9ecc4c59794882da274d4db04a09741d0280
commit d1cb9ecc4c59794882da274d4db04a09741d0280
Author: Thiep Ha <thie...@gmail.com>
Date: Fri Nov 8 16:08:47 2013 +0900
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.b...@samsung.com>
---
ChangeLog | 4 ++++
data/themes/edc/elm/entry.edc | 1 +
src/lib/elm_entry.c | 11 +++++------
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2e58ed5..4939b81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 239287d..620f738 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 77ab8d9..9d2508a 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);
--
