forked from enlightenment/efl
evas_object_table: fix not to use hint_fill on elm_table
Summary: The hint_fill logic in evas_object_table was designed to be used for Efl.Ui.Table not for elm_table. Since Efl.Ui.Table does not use evas_object_table logic, hint_fill logic in evas_object_table is removed. Reviewers: YOhoho Reviewed By: YOhoho Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11982
This commit is contained in:
parent
e53f07f44f
commit
d2291f55dc
|
@ -328,7 +328,6 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Table_Data *
|
||||||
Evas_Object_Table_Option *opt;
|
Evas_Object_Table_Option *opt;
|
||||||
Evas_Coord minw, minh, o_minw, o_minh;
|
Evas_Coord minw, minh, o_minw, o_minh;
|
||||||
Eina_Bool expand_h, expand_v;
|
Eina_Bool expand_h, expand_v;
|
||||||
Eina_Bool fill_h, fill_v;
|
|
||||||
|
|
||||||
o_minw = 0;
|
o_minw = 0;
|
||||||
o_minh = 0;
|
o_minh = 0;
|
||||||
|
@ -349,8 +348,6 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Table_Data *
|
||||||
(child, &opt->pad.l, &opt->pad.r, &opt->pad.t, &opt->pad.b);
|
(child, &opt->pad.l, &opt->pad.r, &opt->pad.t, &opt->pad.b);
|
||||||
evas_object_size_hint_align_get(child, &opt->align.h, &opt->align.v);
|
evas_object_size_hint_align_get(child, &opt->align.h, &opt->align.v);
|
||||||
evas_object_size_hint_weight_get(child, &weightw, &weighth);
|
evas_object_size_hint_weight_get(child, &weightw, &weighth);
|
||||||
//only for Efl.Ui.Table
|
|
||||||
efl_gfx_hint_fill_get(child, &fill_h, &fill_v);
|
|
||||||
|
|
||||||
child_minw = opt->min.w + opt->pad.l + opt->pad.r;
|
child_minw = opt->min.w + opt->pad.l + opt->pad.r;
|
||||||
child_minh = opt->min.h + opt->pad.t + opt->pad.b;
|
child_minh = opt->min.h + opt->pad.t + opt->pad.b;
|
||||||
|
@ -376,13 +373,13 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Table_Data *
|
||||||
expand_v = 1;
|
expand_v = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
opt->fill_h = fill_h;
|
opt->fill_h = 0;
|
||||||
if (opt->align.h < 0.0)
|
if (opt->align.h < 0.0)
|
||||||
{
|
{
|
||||||
opt->align.h = 0.5;
|
opt->align.h = 0.5;
|
||||||
opt->fill_h = 1;
|
opt->fill_h = 1;
|
||||||
}
|
}
|
||||||
opt->fill_v = fill_v;
|
opt->fill_v = 0;
|
||||||
if (opt->align.v < 0.0)
|
if (opt->align.v < 0.0)
|
||||||
{
|
{
|
||||||
opt->align.v = 0.5;
|
opt->align.v = 0.5;
|
||||||
|
|
Loading…
Reference in New Issue