orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Efl.Ui.Base: remove base_scale.get{} from interface. 

base_scale for edje would be legacy now.
This commit is contained in:
Amitesh Singh 2017-11-30 19:27:04 +09:00
parent 3ed9271bf4
commit 2ddea7065f
4 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/edje/Edje_Legacy.h
View File

@ -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

1
src/lib/edje/edje_object.eo
View File

@ -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;

13
src/lib/edje/edje_util.c
View File

@ -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

21
src/lib/efl/interfaces/efl_ui_base.eo
View File

@ -65,26 +65,5 @@ interface Efl.Ui.Base
meaning individual scaling is not set)]]
}
}
@property base_scale {
[[The base scale of a layout object (read-only).
The base scale refers to the scale for which the backing EDC file
was designed. By default it is 1.0 which means the EDC file was
designed for a scale of 1.0.
This base scale can be specified in an EDC file as the
collections' "base_scale" field.
If the object is not a layout, this will return 1.0.
]]
get {
[[Gets a given layout object's base_scale factor.]]
}
values {
base_scale: double(1.0); [[The base_scale factor (the default value
is 1.0, meaning that the edc file was
designed based on scale 1.0).]]
}
}
}
}