diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-10-10 18:59:42 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-10-12 11:25:56 +0900 |
commit | 97c9fa64a461ccf60e63fd8a8982c9b8c5c6290e (patch) | |
tree | 2f4b7ef2760ce39d6951fffee8f69b62d3cbc041 /src/lib/emotion/emotion_smart.c | |
parent | 62abe2cbff0aa809a474f7a89452256f5371ebc3 (diff) |
evas/elm: Remove group_show and group_hide
These should be just overrides of Efl.Gfx.visible.set. Many
widgets were handling smart show() and hide() manually, which
means this patch is quite large.
Hopefully this doesn't break anything, obviously. But here are
some widgets known to be problematic, as the old code flow was
really strange (sometimes not calling the efl_super function):
- window
- notify
Diffstat (limited to '')
-rw-r--r-- | src/lib/emotion/emotion_smart.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 36228ca143..e702c1a9eb 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c | |||
@@ -1946,23 +1946,24 @@ _efl_canvas_video_efl_canvas_group_group_resize(Evas_Object *obj, Efl_Canvas_Vid | |||
1946 | } | 1946 | } |
1947 | 1947 | ||
1948 | EOLIAN static void | 1948 | EOLIAN static void |
1949 | _efl_canvas_video_efl_canvas_group_group_show(Evas_Object *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) | 1949 | _efl_canvas_video_efl_gfx_visible_set(Evas_Object *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, Eina_Bool vis) |
1950 | { | 1950 | { |
1951 | int a; | 1951 | if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) |
1952 | return; | ||
1952 | 1953 | ||
1953 | evas_object_show(sd->obj); | 1954 | efl_gfx_visible_set(efl_super(obj, MY_CLASS), vis); |
1954 | if (sd->crop.clipper) evas_object_show(sd->crop.clipper); | 1955 | efl_gfx_visible_set(sd->obj, vis); |
1956 | efl_gfx_visible_set(sd->crop.clipper, vis); | ||
1955 | 1957 | ||
1956 | evas_object_color_get(sd->bg, NULL, NULL, NULL, &a); | 1958 | if (vis) |
1957 | if (a > 0) evas_object_show(sd->bg); | 1959 | { |
1958 | } | 1960 | int a; |
1959 | 1961 | ||
1960 | EOLIAN static void | 1962 | evas_object_color_get(sd->bg, NULL, NULL, NULL, &a); |
1961 | _efl_canvas_video_efl_canvas_group_group_hide(Evas_Object *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) | 1963 | if (a > 0) efl_gfx_visible_set(sd->bg, EINA_TRUE); |
1962 | { | 1964 | } |
1963 | evas_object_hide(sd->obj); | 1965 | else |
1964 | if (sd->crop.clipper) evas_object_hide(sd->crop.clipper); | 1966 | efl_gfx_visible_set(sd->bg, EINA_FALSE); |
1965 | evas_object_hide(sd->bg); | ||
1966 | } | 1967 | } |
1967 | 1968 | ||
1968 | EOLIAN static void | 1969 | EOLIAN static void |