diff options
| author | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2014-06-25 18:35:56 +0200 |
|---|---|---|
| committer | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2014-06-26 18:14:40 +0200 |
| commit | 1d01f54e815e53d4f062e3298ddc41b43b92f493 (patch) | |
| tree | 6fc6be8eb0d33fc082a874b438e14a050d52d34f /src/ico_window_animation.c | |
| parent | 1833f88d439940844888a0af5188cea10f1a9e76 (diff) | |
| download | ico-uxf-weston-plugin-1d01f54e815e53d4f062e3298ddc41b43b92f493.tar.gz ico-uxf-weston-plugin-1d01f54e815e53d4f062e3298ddc41b43b92f493.tar.bz2 ico-uxf-weston-plugin-1d01f54e815e53d4f062e3298ddc41b43b92f493.zip | |
update to support weston-1.5
wip: disable code using obsolete api
Change-Id: I5aab6167ed98d2b2bcd5b969ca055bae6ca5ad8b
Bug-Tizen: TC-1208
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Diffstat (limited to 'src/ico_window_animation.c')
| -rw-r--r-- | src/ico_window_animation.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/ico_window_animation.c b/src/ico_window_animation.c index c3e0aa8..5e49110 100644 --- a/src/ico_window_animation.c +++ b/src/ico_window_animation.c @@ -39,7 +39,8 @@ #include <sys/stat.h> #include <weston/compositor.h> -#include <weston/weston-layout.h> +#include <weston/ivi-layout.h> +#include <weston/ivi-layout-export.h> #include "ico_ivi_common_private.h" #include "ico_window_mgr_private.h" @@ -488,8 +489,8 @@ animation_end(struct uifw_win_surface *usurf, const int disp) if ((usurf->animation.visible == ANIMA_HIDE_AT_END) && (usurf->visible != 0)) { usurf->visible = 0; - weston_layout_surfaceSetVisibility(usurf->ivisurf, 0); - weston_layout_commitChanges(); + ivi_layout_surfaceSetVisibility(usurf->ivisurf, 0); + ivi_layout_commitChanges(); weston_surface_damage(usurf->surface); if (ev) { weston_view_geometry_dirty(ev); @@ -498,8 +499,8 @@ animation_end(struct uifw_win_surface *usurf, const int disp) if ((usurf->animation.visible == ANIMA_SHOW_AT_END) && (usurf->visible == 0)) { usurf->visible = 1; - weston_layout_surfaceSetVisibility(usurf->ivisurf, 1); - weston_layout_commitChanges(); + ivi_layout_surfaceSetVisibility(usurf->ivisurf, 1); + ivi_layout_commitChanges(); weston_surface_damage(usurf->surface); if (ev) { weston_view_geometry_dirty(ev); @@ -556,7 +557,7 @@ animation_slide(struct weston_animation *animation, { struct uifw_win_surface *usurf; struct animation_data *animadata; - struct weston_layout_SurfaceProperties prop; + struct ivi_layout_SurfaceProperties prop; int dwidth, dheight; int par, x, y; @@ -637,10 +638,10 @@ animation_slide(struct weston_animation *animation, uifw_debug("animation_slide: %08x %d%% %d/%d(target %d/%d) %08x", usurf->surfaceid, par, x, y, usurf->x, usurf->y, (int)usurf->ivisurf); } - if (weston_layout_getPropertiesOfSurface(usurf->ivisurf, &prop) == 0) { - if (weston_layout_surfaceSetDestinationRectangle(usurf->ivisurf, x, y, + if (ivi_layout_getPropertiesOfSurface(usurf->ivisurf, &prop) == 0) { + if (ivi_layout_surfaceSetDestinationRectangle(usurf->ivisurf, x, y, prop.destWidth, prop.destHeight) == 0) { - weston_layout_commitChanges(); + ivi_layout_commitChanges(); } } if (par >= 100) { |