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>
dev
Ucan, Emre (ADITG/SW1) 9 years ago committed by Pekka Paalanen
parent e51647f802
commit ba0c630f12
  1. 3
      ivi-shell/ivi-layout-shell.h
  2. 8
      ivi-shell/ivi-layout.c
  3. 8
      ivi-shell/ivi-shell.c

@ -39,9 +39,6 @@ struct weston_view;
struct weston_surface; struct weston_surface;
struct ivi_layout_surface; struct ivi_layout_surface;
struct weston_view *
ivi_layout_get_weston_view(struct ivi_layout_surface *surface);
void void
ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf, ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf,
int32_t width, int32_t height); int32_t width, int32_t height);

@ -1875,14 +1875,6 @@ ivi_layout_surface_dump(struct weston_surface *surface,
/** /**
* methods of interaction between ivi-shell with ivi-layout * 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 void
ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf, ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf,

@ -339,19 +339,11 @@ bind_ivi_application(struct wl_client *client,
struct weston_view * struct weston_view *
get_default_view(struct weston_surface *surface) get_default_view(struct weston_surface *surface)
{ {
struct ivi_shell_surface *shsurf;
struct weston_view *view; struct weston_view *view;
if (!surface || wl_list_empty(&surface->views)) if (!surface || wl_list_empty(&surface->views))
return NULL; 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) { wl_list_for_each(view, &surface->views, surface_link) {
if (weston_view_is_mapped(view)) if (weston_view_is_mapped(view))
return view; return view;

Loading…
Cancel
Save