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

efl_ui/layout: implement group_calc, add finger size for inherited layouts 

Summary:
this adds a group_calc implementation for the layout object (not layout_base)
to allow differentiation between inherited layout calcs and layout object
calcs

by using this, we can automatically apply finger size to inherited layout
calcs if the implementation ever reaches this point

Depends on D9435

Reviewers: bu5hm4n

Reviewed By: bu5hm4n

Subscribers: bu5hm4n, cedric, #reviewers, #committers

Tags: #efl_widgets

Maniphest Tasks: T8059

Differential Revision: https://phab.enlightenment.org/D9436
This commit is contained in:
Mike Blumenkrantz 2019-07-30 13:11:30 -04:00
parent 268d06d381
commit 46cf288d32
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/elementary/efl_ui_layout.c
View File

@ -160,7 +160,7 @@ _part_cursor_free(Efl_Ui_Layout_Sub_Object_Cursor *pc)
}
static void
_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd)
_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd, Eina_Bool finger)
{
int minh = 0, minw = 0;
int rest_w = 0, rest_h = 0;
@ -169,6 +169,8 @@ _sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd)
if (!efl_alive_get(obj)) return;
if (finger)
elm_coords_finger_size_adjust(1, &rest_w, 1, &rest_h);
if (elm_widget_is_legacy(obj))
sz = efl_gfx_hint_size_combined_min_get(obj);
else
@ -837,16 +839,24 @@ _efl_ui_layout_base_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Data *sd)
efl_canvas_group_del(efl_super(obj, MY_CLASS));
}
EOLIAN static void
_efl_ui_layout_efl_canvas_group_group_calculate(Eo *obj, void *_pd EINA_UNUSED)
{
efl_canvas_group_need_recalculate_set(obj, EINA_FALSE);
_sizing_eval(obj, efl_data_scope_get(obj, MY_CLASS), NULL);
}
/* rewrite or extend this one on your derived class as to suit your
* needs */
EOLIAN static void
_efl_ui_layout_base_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Data *sd)
{
if (sd->needs_size_calc)
{
_sizing_eval(obj, sd);
sd->needs_size_calc = EINA_FALSE;
}
Eina_Bool legacy = elm_widget_is_legacy(obj);
efl_canvas_group_need_recalculate_set(obj, EINA_FALSE);
if ((!legacy) || sd->needs_size_calc)
/* don't add finger size if this is an actual elm_layout object */
_sizing_eval(obj, sd, !legacy);
sd->needs_size_calc = EINA_FALSE;
}
static Efl_Ui_Layout_Sub_Object_Cursor *

1
src/lib/elementary/efl_ui_layout.eo
View File

@ -16,5 +16,6 @@ class Efl.Ui.Layout extends Efl.Ui.Layout_Base implements Efl.File
Efl.File.key { get; set; }
Efl.File.mmap { get; set; }
Efl.File.load;
Efl.Canvas.Group.group_calculate;
}
}