mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-shell: remove unnecesary code in ivi_shell_surface_configure

Browse Source 
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>
This commit is contained in:
Nobuhiko Tanibata 2015-04-27 17:02:35 +09:00 committed by Pekka Paalanen
parent 65160dcade
commit 0a19e23356
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ivi-shell/ivi-shell.c
View 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);
}