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

ivi-shell: remove ivi_layout_layer_get_opacity API

Browse Source 
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Acked-by: wataru_natsume <wataru_natsume@xddp.denso.co.jp>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Ucan, Emre \(ADITG/SW1\) 2016-03-04 12:50:16 +00:00 committed by Bryce Harrington
parent 995e6fbcd0
commit c3aee1f67f
5 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ivi-shell/ivi-layout-export.h
View File

@ -529,14 +529,6 @@ struct ivi_layout_interface {
int32_t (*layer_set_opacity)(struct ivi_layout_layer *ivilayer,
wl_fixed_t opacity);
/**
* \brief Get the opacity of a ivi_layer.
*
* \return opacity if the method call was successful
* \return wl_fixed_from_double(0.0) if the method call was failed
*/
wl_fixed_t (*layer_get_opacity)(struct ivi_layout_layer *ivilayer);
/**
* \brief Set the area of a ivi_layer which should be used for the rendering.
*

2
ivi-shell/ivi-layout-private.h
View File

@ -199,8 +199,6 @@ ivi_layout_get_surface_from_id(uint32_t id_surface);
int32_t
ivi_layout_layer_set_opacity(struct ivi_layout_layer *ivilayer,
wl_fixed_t opacity);
wl_fixed_t
ivi_layout_layer_get_opacity(struct ivi_layout_layer *ivilayer);
int32_t
ivi_layout_layer_set_visibility(struct ivi_layout_layer *ivilayer,
bool newVisibility);

2
ivi-shell/ivi-layout-transition.c
View File

@ -831,7 +831,7 @@ ivi_layout_transition_fade_layer(
data = transition->private_data;
/* FIXME */
fixed_opacity = ivi_layout_layer_get_opacity(layer);
fixed_opacity = layer->prop.opacity;
now_opacity = wl_fixed_to_double(fixed_opacity);
remain = 0.0;

12
ivi-shell/ivi-layout.c
View File

@ -1810,17 +1810,6 @@ ivi_layout_layer_set_opacity(struct ivi_layout_layer *ivilayer,
return IVI_SUCCEEDED;
}
wl_fixed_t
ivi_layout_layer_get_opacity(struct ivi_layout_layer *ivilayer)
{
if (ivilayer == NULL) {
weston_log("ivi_layout_layer_get_opacity: invalid argument\n");
return wl_fixed_from_double(0.0);
}
return ivilayer->prop.opacity;
}
static int32_t
ivi_layout_layer_set_source_rectangle(struct ivi_layout_layer *ivilayer,
int32_t x, int32_t y,
@ -2745,7 +2734,6 @@ static struct ivi_layout_interface ivi_layout_interface = {
.get_layers_on_screen = ivi_layout_get_layers_on_screen,
.layer_set_visibility = ivi_layout_layer_set_visibility,
.layer_set_opacity = ivi_layout_layer_set_opacity,
.layer_get_opacity = ivi_layout_layer_get_opacity,
.layer_set_source_rectangle = ivi_layout_layer_set_source_rectangle,
.layer_set_destination_rectangle = ivi_layout_layer_set_destination_rectangle,
.layer_set_position = ivi_layout_layer_set_position,

16
tests/ivi_layout-internal-test.c
View File

@ -202,18 +202,16 @@ test_layer_opacity(struct test_context *ctx)
ivilayer = lyt->layer_create_with_dimension(IVI_TEST_LAYER_ID(0), 200, 300);
iassert(ivilayer != NULL);
iassert(lyt->layer_get_opacity(ivilayer) == wl_fixed_from_double(1.0));
prop = lyt->get_properties_of_layer(ivilayer);
iassert(prop->opacity == wl_fixed_from_double(1.0));
iassert(lyt->layer_set_opacity(
ivilayer, wl_fixed_from_double(0.5)) == IVI_SUCCEEDED);
iassert(lyt->layer_get_opacity(ivilayer) == wl_fixed_from_double(1.0));
iassert(prop->opacity == wl_fixed_from_double(1.0));
lyt->commit_changes();
iassert(lyt->layer_get_opacity(ivilayer) == wl_fixed_from_double(0.5));
prop = lyt->get_properties_of_layer(ivilayer);
iassert(prop->opacity == wl_fixed_from_double(0.5));
lyt->layer_destroy(ivilayer);
@ -430,6 +428,7 @@ test_layer_bad_opacity(struct test_context *ctx)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
struct ivi_layout_layer *ivilayer;
const struct ivi_layout_layer_properties *prop;
ivilayer = lyt->layer_create_with_dimension(IVI_TEST_LAYER_ID(0), 200, 300);
iassert(ivilayer != NULL);
@ -445,22 +444,21 @@ test_layer_bad_opacity(struct test_context *ctx)
lyt->commit_changes();
iassert(lyt->layer_get_opacity(ivilayer) == wl_fixed_from_double(0.3));
prop = lyt->get_properties_of_layer(ivilayer);
iassert(prop->opacity == wl_fixed_from_double(0.3));
iassert(lyt->layer_set_opacity(
ivilayer, wl_fixed_from_double(1.1)) == IVI_FAILED);
lyt->commit_changes();
iassert(lyt->layer_get_opacity(ivilayer) == wl_fixed_from_double(0.3));
iassert(prop->opacity == wl_fixed_from_double(0.3));
iassert(lyt->layer_set_opacity(
NULL, wl_fixed_from_double(0.5)) == IVI_FAILED);
lyt->commit_changes();
iassert(lyt->layer_get_opacity(NULL) == wl_fixed_from_double(0.0));
lyt->layer_destroy(ivilayer);
}