ivi-shell: remove unnecesary code in ivi_shell_surface_configure
authorNobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp>
Mon, 27 Apr 2015 08:02:35 +0000 (17:02 +0900)
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>
Tue, 28 Apr 2015 09:59:19 +0000 (12:59 +0300)
This method should not update weston_view directly. This shall be done by
controller via ivi_layout_*.

Signed-off-by: Nobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
ivi-shell/ivi-shell.c

index aef8e638b77b027f0ae776507cdd34b289232959..4a688ccb6f518bc450352ebb1e71c611d7a7a785 100644 (file)
@@ -112,33 +112,15 @@ ivi_shell_surface_configure(struct weston_surface *surface,
                            int32_t sx, int32_t sy)
 {
        struct ivi_shell_surface *ivisurf = get_ivi_shell_surface(surface);
-       struct weston_view *view;
-       float from_x;
-       float from_y;
-       float to_x;
-       float to_y;
 
        if (surface->width == 0 || surface->height == 0 || ivisurf == NULL)
                return;
 
-       view = ivi_layout_get_weston_view(ivisurf->layout_surface);
-
-       if (view == NULL)
-               return;
-
        if (ivisurf->width != surface->width ||
            ivisurf->height != surface->height) {
                ivisurf->width  = surface->width;
                ivisurf->height = surface->height;
 
-               weston_view_to_global_float(view, 0, 0, &from_x, &from_y);
-               weston_view_to_global_float(view, sx, sy, &to_x, &to_y);
-
-               weston_view_set_position(view,
-                                        view->geometry.x + to_x - from_x,
-                                        view->geometry.y + to_y - from_y);
-               weston_view_update_transform(view);
-
                ivi_layout_surface_configure(ivisurf->layout_surface,
                                             surface->width, surface->height);
        }