diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-10-11 12:39:05 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-10-12 11:25:56 +0900 |
commit | 11b7cf6b728001dbcd42ce41d5ac2e129a835fd8 (patch) | |
tree | fe09c44ddb1e8b72b0464231e2363256f937d0c8 /src/lib/emotion/emotion_smart.c | |
parent | a0b8408021fc0dd46e5e4d8425755448d4d28c53 (diff) |
evas/elm: Remove function group_move
This is an override of efl_gfx_position_set.
As for the other patches, I hope I didn't break anything.
A problem likely to happen is that the super call was inserted
too early or too late in the call flow. For instance:
_myclass_position_set(obj, x, y) {
position_set(super(obj), x, y);
position_get(obj, &prevx, &prevy);
do_something_with_delta_xy();
}
The above code flow is obvisouly wrong, but may have crept in this
patch (such a bug sneaked in inside smart object, breaking
everything at first).
Diffstat (limited to '')
-rw-r--r-- | src/lib/emotion/emotion_smart.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index e702c1a9eb..266473905c 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c | |||
@@ -1929,11 +1929,16 @@ _efl_canvas_video_efl_canvas_group_group_del(Evas_Object *obj EINA_UNUSED, Efl_C | |||
1929 | } | 1929 | } |
1930 | 1930 | ||
1931 | EOLIAN static void | 1931 | EOLIAN static void |
1932 | _efl_canvas_video_efl_canvas_group_group_move(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Evas_Coord x, Evas_Coord y) | 1932 | _efl_canvas_video_efl_gfx_position_set(Evas_Object *obj, Efl_Canvas_Video_Data *sd, Evas_Coord x, Evas_Coord y) |
1933 | { | 1933 | { |
1934 | int w, h; | 1934 | int w, h; |
1935 | 1935 | ||
1936 | evas_object_geometry_get(obj, NULL, NULL, &w, &h); | 1936 | if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, x, y)) |
1937 | return; | ||
1938 | |||
1939 | efl_gfx_size_get(obj, &w, &h); | ||
1940 | efl_gfx_position_set(efl_super(obj, MY_CLASS), x, y); | ||
1941 | |||
1937 | _clipper_position_size_update(obj, x, y, w, h, sd->video.w, sd->video.h); | 1942 | _clipper_position_size_update(obj, x, y, w, h, sd->video.w, sd->video.h); |
1938 | evas_object_move(sd->bg, x, y); | 1943 | evas_object_move(sd->bg, x, y); |
1939 | } | 1944 | } |