ivi-shell: pass only ivi_view to update_prop
We can get ivisurf, ivilayer and iviscreen easily from ivi_view. Then, we do not need to check, if ivi_view's layer is the same as the given ivilayer. Signed-off-by: Emre Ucan <eucan@de.adit-jv.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
committed by
Pekka Paalanen
parent
819824d605
commit
1b92ba20ac
@@ -612,18 +612,14 @@ calc_surface_to_global_matrix_and_mask_to_weston_surface(
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
update_prop(struct ivi_layout_screen *iviscrn,
|
update_prop(struct ivi_layout_view *ivi_view)
|
||||||
struct ivi_layout_layer *ivilayer,
|
|
||||||
struct ivi_layout_view *ivi_view)
|
|
||||||
{
|
{
|
||||||
struct ivi_layout_surface *ivisurf;
|
struct ivi_layout_surface *ivisurf = ivi_view->ivisurf;
|
||||||
|
struct ivi_layout_layer *ivilayer = ivi_view->on_layer;
|
||||||
|
struct ivi_layout_screen *iviscrn = ivilayer->on_screen;
|
||||||
struct ivi_rectangle r;
|
struct ivi_rectangle r;
|
||||||
bool can_calc = true;
|
bool can_calc = true;
|
||||||
|
|
||||||
assert(ivi_view->on_layer == ivilayer);
|
|
||||||
|
|
||||||
ivisurf = ivi_view->ivisurf;
|
|
||||||
|
|
||||||
/*In case of no prop change, this just returns*/
|
/*In case of no prop change, this just returns*/
|
||||||
if (!ivilayer->prop.event_mask && !ivisurf->prop.event_mask)
|
if (!ivilayer->prop.event_mask && !ivisurf->prop.event_mask)
|
||||||
return;
|
return;
|
||||||
@@ -685,7 +681,7 @@ commit_changes(struct ivi_layout *layout)
|
|||||||
if (ivi_view->ivisurf->prop.visibility == false)
|
if (ivi_view->ivisurf->prop.visibility == false)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
update_prop(iviscrn, ivilayer, ivi_view);
|
update_prop(ivi_view);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user