From bec631aa2cb0f3edb6d277ca33f56691b2e4991f Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Fri, 26 Oct 2018 20:09:37 +0900 Subject: [PATCH] evas_image: Force stacking check on non-video surface Summary: We use this code path for native image hardware planes. Force the stacking check on those for now so planes don't accidentally occlude surfaces above them. Reviewers: Hermet Reviewed By: Hermet Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7188 --- src/lib/evas/canvas/evas_image_legacy.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c index 7f8d48693d..6fa92672d3 100644 --- a/src/lib/evas/canvas/evas_image_legacy.c +++ b/src/lib/evas/canvas/evas_image_legacy.c @@ -984,7 +984,11 @@ evas_object_image_video_surface_caps_get(const Evas_Object *eo_obj) EVAS_IMAGE_LEGACY_API(eo_obj, 0); Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); - return (!o->video_surface ? 0 : o->pixels->video_caps); + + /* The generic hardware plane code calls this function on + * non-video surfaces, return stacking check for those to + * allow them to use common video surface code */ + return (!o->video_surface ? EVAS_VIDEO_SURFACE_STACKING_CHECK : o->pixels->video_caps); } /* deprecated */