summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>2015-07-15 13:55:50 +0900
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-07-16 11:57:59 +0300
commit4c1dbf721372b690f23c95e4fc5cf7f4b6502a04 (patch)
tree9597f7801633d3bdcd0f69da6390521f851c48fe
parent8c7287f5ba67d2a3116c7ec1c9c012b8f34a4423 (diff)
downloadweston-4c1dbf721372b690f23c95e4fc5cf7f4b6502a04.tar.gz
ivi-shell: remove one indent level from update_prop()
There is no logic update. Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r--ivi-shell/ivi-layout.c39
1 files changed, 21 insertions, 18 deletions
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 5f9235c2..fdba0dde 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -756,30 +756,33 @@ static void
update_prop(struct ivi_layout_layer *ivilayer,
struct ivi_layout_surface *ivisurf)
{
- if (ivilayer->event_mask | ivisurf->event_mask) {
- struct weston_view *tmpview;
- update_opacity(ivilayer, ivisurf);
- update_layer_orientation(ivilayer, ivisurf);
- update_layer_position(ivilayer, ivisurf);
- update_surface_position(ivisurf);
- update_surface_orientation(ivilayer, ivisurf);
- update_scale(ivilayer, ivisurf);
+ struct weston_view *tmpview;
- ivisurf->update_count++;
+ if (!ivilayer->event_mask && !ivisurf->event_mask) {
+ return;
+ }
- wl_list_for_each(tmpview, &ivisurf->surface->views, surface_link) {
- if (tmpview != NULL) {
- break;
- }
- }
+ update_opacity(ivilayer, ivisurf);
+ update_layer_orientation(ivilayer, ivisurf);
+ update_layer_position(ivilayer, ivisurf);
+ update_surface_position(ivisurf);
+ update_surface_orientation(ivilayer, ivisurf);
+ update_scale(ivilayer, ivisurf);
+
+ ivisurf->update_count++;
+ wl_list_for_each(tmpview, &ivisurf->surface->views, surface_link) {
if (tmpview != NULL) {
- weston_view_geometry_dirty(tmpview);
+ break;
}
+ }
- if (ivisurf->surface != NULL) {
- weston_surface_damage(ivisurf->surface);
- }
+ if (tmpview != NULL) {
+ weston_view_geometry_dirty(tmpview);
+ }
+
+ if (ivisurf->surface != NULL) {
+ weston_surface_damage(ivisurf->surface);
}
}