diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-01-23 15:39:43 -0500 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-01-24 08:24:32 +0100 |
| commit | 70827b4d7e05c18a6c41038677156656c425926b (patch) | |
| tree | fcf6b1a13abc8ba76e85c43fa52a8106fd110d2a | |
| parent | a44399fc5d708745817f0545aad1dc1e69e9f184 (diff) | |
| download | efl-70827b4d7e05c18a6c41038677156656c425926b.tar.gz | |
efl_ui_layout: implement remaining efl.layout.calc methods
this is just proxying the method calls onto the inner edje object
ref T5719
Reviewed-by: Marcel Hollerbach <marcel-hollerbach@t-online.de>
Differential Revision: https://phab.enlightenment.org/D7740
| -rw-r--r-- | src/lib/elementary/efl_ui_layout.c | 36 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_layout.eo | 4 |
2 files changed, 40 insertions, 0 deletions
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index b3aaa083e9..6101aed411 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -6,6 +6,7 @@ #define ELM_LAYOUT_PROTECTED #define EFL_UI_WIDGET_PART_BG_PROTECTED #define EFL_PART_PROTECTED +#define EFL_LAYOUT_CALC_PROTECTED #include <Elementary.h> @@ -1758,6 +1759,41 @@ _efl_ui_layout_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Data *sd) return 0; } +EOLIAN void +_efl_ui_layout_efl_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *sd EINA_UNUSED, Eina_Bool update) +{ + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + efl_layout_calc_auto_update_hints_set(wd->resize_obj, update); +} + +EOLIAN Eina_Bool +_efl_ui_layout_efl_layout_calc_calc_auto_update_hints_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *sd EINA_UNUSED) +{ + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); + return efl_layout_calc_auto_update_hints_get(wd->resize_obj); +} + +EOLIAN Eina_Size2D +_efl_ui_layout_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *sd EINA_UNUSED, Eina_Size2D restricted) +{ + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, restricted); + return efl_layout_calc_size_min(wd->obj, restricted); +} + +EOLIAN Eina_Rect +_efl_ui_layout_efl_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *sd EINA_UNUSED) +{ + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, (Eina_Rect){.rect = {0, 0, 0, 0}}); + return efl_layout_calc_parts_extends(wd->obj); +} + +EOLIAN void +_efl_ui_layout_efl_layout_calc_calc_force(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *sd EINA_UNUSED) +{ + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + efl_layout_calc_force(wd->obj); +} + static Eina_Bool _efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Data *sd, const char *part_name, const char *cursor) { diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo index 4bae6917e0..72a294855f 100644 --- a/src/lib/elementary/efl_ui_layout.eo +++ b/src/lib/elementary/efl_ui_layout.eo @@ -53,6 +53,10 @@ class Efl.Ui.Layout extends Efl.Ui.Widget implements Efl.Container, Efl.File, Efl.Canvas.Group.group_calculate; Efl.Layout.Calc.calc_freeze; Efl.Layout.Calc.calc_thaw; + Efl.Layout.Calc.calc_auto_update_hints { get; set; } + Efl.Layout.Calc.calc_size_min; + Efl.Layout.Calc.calc_parts_extends; + Efl.Layout.Calc.calc_force; Efl.Layout.Signal.signal_callback_add; Efl.Layout.Signal.signal_callback_del; Efl.Layout.Signal.signal_emit; |