aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-11-30 19:27:04 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-11-30 19:27:04 +0900
commit2ddea7065f0bd60764ad7b7f8118463a14a37085 (patch)
treef5770d3bdd935ca42315802e8cb804d23b9baf75 /src/lib/edje
parentelm tests: show nstate & slider_interval widgets in Efl.Ui scope (diff)
downloadefl-2ddea7065f0bd60764ad7b7f8118463a14a37085.tar.gz
Efl.Ui.Base: remove base_scale.get{} from interface.
base_scale for edje would be legacy now.
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/Edje_Legacy.h2
-rw-r--r--src/lib/edje/edje_object.eo1
-rw-r--r--src/lib/edje/edje_util.c13
3 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index 78d9656bfe..e13aef9a50 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -1507,7 +1507,7 @@ EAPI double edje_object_scale_get(const Edje_Object *obj);
*
* @ingroup Edje_Object
*/
-EAPI double edje_object_base_scale_get(const Edje_Object *obj);
+EAPI double edje_object_base_scale_get(const Evas_Object *obj);
/**
* @defgroup Edje_Part_Drag Edje Drag
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index d077b6a3e0..2be3869e9a 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -126,7 +126,6 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
Efl.Ui.Base.mirrored { set; get; }
Efl.Ui.Base.language { set; get; }
Efl.Ui.Base.scale { set; get; }
- Efl.Ui.Base.base_scale { get; }
Efl.File.load_error { get; }
Efl.File.mmap { get; set; }
Efl.Container.content_remove;
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index fc47e43b13..06bc9ee1ba 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -395,17 +395,14 @@ _edje_object_efl_ui_base_scale_get(Eo *obj EINA_UNUSED, Edje *ed)
return TO_DOUBLE(ed->scale);
}
-EOLIAN double
-_edje_object_efl_ui_base_base_scale_get(Eo *obj EINA_UNUSED, Edje *ed)
-{
- if (!ed->file) return 1.0;
- return TO_DOUBLE(ed->file->base_scale);
-}
-
EAPI double
edje_object_base_scale_get(const Eo *obj)
{
- return efl_ui_base_scale_get(obj);
+ Edje *ed;
+
+ ed = _edje_fetch(obj);
+ if (!ed->file) return 1.0;
+ return TO_DOUBLE(ed->scale);
}
EOLIAN Eina_Bool