diff options
| author | Ucan, Emre (ADITG/SW1) <eucan@de.adit-jv.com> | 2016-06-07 09:40:17 +0000 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-06-13 12:24:04 +0300 |
| commit | ba0c630f1206cd60be9a6bec8b67bd21232fa549 (patch) | |
| tree | cfb6c2585d9b22356ece0e2abe0145a2faf406df /ivi-shell | |
| parent | e51647f802248b7214900530adccb55633bc2507 (diff) | |
ivi-shell: remove ivi_layout_get_weston_view
A surface could have more than one views.
Therefore, it is not possible to map a surface to
a specific view. The implementation of the API
iterates the list of views of the surface, and
returns the first found view.
It is not necessary to have this API to found
a view of the surface. Therefore, I removed the API.
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'ivi-shell')
| -rw-r--r-- | ivi-shell/ivi-layout-shell.h | 3 | ||||
| -rw-r--r-- | ivi-shell/ivi-layout.c | 8 | ||||
| -rw-r--r-- | ivi-shell/ivi-shell.c | 8 |
3 files changed, 0 insertions, 19 deletions
diff --git a/ivi-shell/ivi-layout-shell.h b/ivi-shell/ivi-layout-shell.h index 3221a0ac..68ca68ba 100644 --- a/ivi-shell/ivi-layout-shell.h +++ b/ivi-shell/ivi-layout-shell.h @@ -39,9 +39,6 @@ struct weston_view; struct weston_surface; struct ivi_layout_surface; -struct weston_view * -ivi_layout_get_weston_view(struct ivi_layout_surface *surface); - void ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf, int32_t width, int32_t height); diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 81e5621b..9ce0ab0a 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -1875,14 +1875,6 @@ ivi_layout_surface_dump(struct weston_surface *surface, /** * methods of interaction between ivi-shell with ivi-layout */ -struct weston_view * -ivi_layout_get_weston_view(struct ivi_layout_surface *surface) -{ - if (surface == NULL) - return NULL; - - return get_weston_view(surface); -} void ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf, diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c index c1af78c2..6ecb32fa 100644 --- a/ivi-shell/ivi-shell.c +++ b/ivi-shell/ivi-shell.c @@ -339,19 +339,11 @@ bind_ivi_application(struct wl_client *client, struct weston_view * get_default_view(struct weston_surface *surface) { - struct ivi_shell_surface *shsurf; struct weston_view *view; if (!surface || wl_list_empty(&surface->views)) return NULL; - shsurf = get_ivi_shell_surface(surface); - if (shsurf && shsurf->layout_surface) { - view = ivi_layout_get_weston_view(shsurf->layout_surface); - if (view) - return view; - } - wl_list_for_each(view, &surface->views, surface_link) { if (weston_view_is_mapped(view)) return view; |