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

evas: Set default align to FILL for EO objects 

See also 1a1b8bc451
This commit is contained in:
Jean-Philippe Andre 2017-08-23 15:23:50 +09:00
parent 29bacf5988
commit e8b7f5f255
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/evas/canvas/evas_object_main.c
View File

@ -210,6 +210,9 @@ _efl_canvas_object_efl_object_finalize(Eo *eo_obj, Evas_Object_Protected_Data *o
if (!obj->legacy.weight_set)
efl_gfx_size_hint_weight_set(eo_obj, 1.0, 1.0);
if (!obj->legacy.align_set)
efl_gfx_size_hint_align_set(eo_obj, -1.0, -1.0);
if (obj->legacy.visible_set /* && ... */)
{
obj->legacy.finalized = EINA_TRUE;
@ -1605,6 +1608,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_align_set(Eo *eo_obj, Evas_Object_Prot
if (obj->delete_me)
return;
evas_object_async_block(obj);
if (!obj->legacy.align_set) obj->legacy.align_set = 1;
if (EINA_UNLIKELY(!obj->size_hints))
{
if (EINA_DBL_EQ(x, 0.5) && EINA_DBL_EQ(y, 0.5)) return;
@ -1635,10 +1639,10 @@ _efl_canvas_object_efl_gfx_size_hint_hint_weight_get(Eo *eo_obj EINA_UNUSED, Eva
EOLIAN static void
_efl_canvas_object_efl_gfx_size_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y)
{
obj->legacy.weight_set = 1;
if (obj->delete_me)
return;
evas_object_async_block(obj);
if (!obj->legacy.weight_set) obj->legacy.weight_set = 1;
if (EINA_UNLIKELY(!obj->size_hints))
{
if (EINA_DBL_EQ(x, 0.0) && EINA_DBL_EQ(y, 0.0)) return;

1
src/lib/evas/include/evas_private.h
View File

@ -1262,6 +1262,7 @@ struct _Evas_Object_Protected_Data
Eina_Bool ctor : 1; // used legacy constructor
Eina_Bool visible_set : 1; // visibility manually set
Eina_Bool weight_set : 1; // weight manually set
Eina_Bool align_set : 1; // align manually set
Eina_Bool finalized : 1; // object fully constructed
} legacy;