summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2020-06-16 20:40:59 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2020-06-16 20:40:59 +0900
commitd2291f55dc1b904a98d12611a466223949aa294f (patch)
treecbaf19aec89503f6de1a7524791e827490485846
parente53f07f44ff7f7a9454586e3448c1ca23e926a84 (diff)
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
-rw-r--r--src/lib/evas/canvas/evas_object_table.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index e07496adb1..9d261bcd84 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -328,7 +328,6 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Table_Data *
328 Evas_Object_Table_Option *opt; 328 Evas_Object_Table_Option *opt;
329 Evas_Coord minw, minh, o_minw, o_minh; 329 Evas_Coord minw, minh, o_minw, o_minh;
330 Eina_Bool expand_h, expand_v; 330 Eina_Bool expand_h, expand_v;
331 Eina_Bool fill_h, fill_v;
332 331
333 o_minw = 0; 332 o_minw = 0;
334 o_minh = 0; 333 o_minh = 0;
@@ -349,8 +348,6 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Table_Data *
349 (child, &opt->pad.l, &opt->pad.r, &opt->pad.t, &opt->pad.b); 348 (child, &opt->pad.l, &opt->pad.r, &opt->pad.t, &opt->pad.b);
350 evas_object_size_hint_align_get(child, &opt->align.h, &opt->align.v); 349 evas_object_size_hint_align_get(child, &opt->align.h, &opt->align.v);
351 evas_object_size_hint_weight_get(child, &weightw, &weighth); 350 evas_object_size_hint_weight_get(child, &weightw, &weighth);
352 //only for Efl.Ui.Table
353 efl_gfx_hint_fill_get(child, &fill_h, &fill_v);
354 351
355 child_minw = opt->min.w + opt->pad.l + opt->pad.r; 352 child_minw = opt->min.w + opt->pad.l + opt->pad.r;
356 child_minh = opt->min.h + opt->pad.t + opt->pad.b; 353 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 *
376 expand_v = 1; 373 expand_v = 1;
377 } 374 }
378 375
379 opt->fill_h = fill_h; 376 opt->fill_h = 0;
380 if (opt->align.h < 0.0) 377 if (opt->align.h < 0.0)
381 { 378 {
382 opt->align.h = 0.5; 379 opt->align.h = 0.5;
383 opt->fill_h = 1; 380 opt->fill_h = 1;
384 } 381 }
385 opt->fill_v = fill_v; 382 opt->fill_v = 0;
386 if (opt->align.v < 0.0) 383 if (opt->align.v < 0.0)
387 { 384 {
388 opt->align.v = 0.5; 385 opt->align.v = 0.5;