diff options
| author | Nobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp> | 2015-04-27 16:54:01 +0900 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-04-28 12:59:18 +0300 |
| commit | e6cc997097ede3f67892be916ac0afd25698afb6 (patch) | |
| tree | edb3032b46a5dffd774b838c71e60c7ac752f62d | |
| parent | c3fd624e29c5815903caaf4c6f1875a515f5bd04 (diff) | |
| download | weston-e6cc997097ede3f67892be916ac0afd25698afb6.tar.gz | |
ivi-shell: remove unnecesary code in ivi_layout_surface_configure
ivi_layout_surface_configure is called from ivi-shell when configure
listener of weston surface is triggered. This function shall do,
- emit signal to hmi-controller to notify the configuration change
Other unnecesary logics are cleaned up.
Signed-off-by: Nobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
| -rw-r--r-- | ivi-shell/ivi-layout.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 0c394a9d..95d09087 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -2738,29 +2738,10 @@ ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf, int32_t width, int32_t height) { struct ivi_layout *layout = get_instance(); - int32_t in_init = 0; - ivisurf->surface->width_from_buffer = width; - ivisurf->surface->height_from_buffer = height; - if (ivisurf->prop.source_width == 0 || ivisurf->prop.source_height == 0) { - in_init = 1; - } - - /* FIXME: when sourceHeight/Width is used as clipping range in image buffer */ - /* if (ivisurf->prop.sourceWidth == 0 || ivisurf->prop.sourceHeight == 0) { */ - ivisurf->pending.prop.source_width = width; - ivisurf->pending.prop.source_height = height; - ivisurf->prop.source_width = width; - ivisurf->prop.source_height = height; - /* } */ - - ivisurf->event_mask |= IVI_NOTIFICATION_CONFIGURE; - - if (in_init) { - wl_signal_emit(&layout->surface_notification.configure_changed, ivisurf); - } else { - ivi_layout_commit_changes(); - } + /* emit callback which is set by ivi-layout api user */ + wl_signal_emit(&layout->surface_notification.configure_changed, + ivisurf); } static int32_t |