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

ivi-shell: remove ivi_layout_layer_get_position 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>
dev
Ucan, Emre \(ADITG/SW1\) 9 years ago committed by Bryce Harrington
parent b2ff255792
commit dfc2d76432
6 changed files with 15 additions and 63 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      ivi-shell/hmi-controller.c
  2. 9
      ivi-shell/ivi-layout-export.h
  3. 3
      ivi-shell/ivi-layout-private.h
  4. 6
      ivi-shell/ivi-layout-transition.c
  5. 16
      ivi-shell/ivi-layout.c
  6. 33
      tests/ivi_layout-internal-test.c

11
ivi-shell/hmi-controller.c
Unescape View File

@ -1417,6 +1417,7 @@ move_workspace_grab_end(struct move_grab *move, struct wl_resource* resource,
{
struct hmi_controller *hmi_ctrl = wl_resource_get_user_data(resource);
int32_t width = hmi_ctrl->workspace_background_layer.width;
const struct ivi_layout_layer_properties *prop;
struct timespec time = {0};
double grab_time = 0.0;
@ -1443,8 +1444,9 @@ move_workspace_grab_end(struct move_grab *move, struct wl_resource* resource,
if (200 < from_motion_time)
pointer_v = 0.0;
ivi_layout_interface->layer_get_position(layer, &pos_x, &pos_y);
prop = ivi_layout_interface->get_properties_of_layer(layer);
pos_x = prop->dest_x;
pos_y = prop->dest_y;
if (is_flick) {
int orgx = wl_fixed_to_int(move->dst[0] + grab_x);
@ -1733,6 +1735,7 @@ move_grab_init_workspace(struct move_grab* move,
{
struct hmi_controller *hmi_ctrl = wl_resource_get_user_data(resource);
struct ivi_layout_layer *layer = hmi_ctrl->workspace_layer.ivilayer;
const struct ivi_layout_layer_properties *prop;
int32_t workspace_count = hmi_ctrl->workspace_count;
int32_t workspace_width = hmi_ctrl->workspace_background_layer.width;
int32_t layer_pos_x = 0;
@ -1741,7 +1744,9 @@ move_grab_init_workspace(struct move_grab* move,
wl_fixed_t rgn[2][2] = {{0}};
wl_fixed_t grab_pos[2] = { grab_x, grab_y };
ivi_layout_interface->layer_get_position(layer, &layer_pos_x, &layer_pos_y);
prop = ivi_layout_interface->get_properties_of_layer(layer);
layer_pos_x = prop->dest_x;
layer_pos_y = prop->dest_y;
start_pos[0] = wl_fixed_from_int(layer_pos_x);
start_pos[1] = wl_fixed_from_int(layer_pos_y);

9
ivi-shell/ivi-layout-export.h
Unescape View File

@ -554,15 +554,6 @@ struct ivi_layout_interface {
int32_t (*layer_set_position)(struct ivi_layout_layer *ivilayer,
int32_t dest_x, int32_t dest_y);
/**
* \brief Get the horizontal and vertical position of the ivi_layer.
*
* \return IVI_SUCCEEDED if the method call was successful
* \return IVI_FAILED if the method call was failed
*/
int32_t (*layer_get_position)(struct ivi_layout_layer *ivilayer,
int32_t *dest_x, int32_t *dest_y);
/**
* \brief Set the horizontal and vertical dimension of the layer.
*

3
ivi-shell/ivi-layout-private.h
Unescape View File

@ -206,9 +206,6 @@ int32_t
ivi_layout_layer_set_position(struct ivi_layout_layer *ivilayer,
int32_t dest_x, int32_t dest_y);
int32_t
ivi_layout_layer_get_position(struct ivi_layout_layer *ivilayer,
int32_t *dest_x, int32_t *dest_y);
int32_t
ivi_layout_layer_set_render_order(struct ivi_layout_layer *ivilayer,
struct ivi_layout_surface **pSurface,
int32_t number);

6
ivi-shell/ivi-layout-transition.c
Unescape View File

@ -736,12 +736,10 @@ ivi_layout_transition_move_layer(struct ivi_layout_layer *layer,
int32_t dest_x, int32_t dest_y,
uint32_t duration)
{
int32_t start_pos_x = 0;
int32_t start_pos_y = 0;
int32_t start_pos_x = layer->prop.dest_x;
int32_t start_pos_y = layer->prop.dest_y;
struct ivi_layout_transition *transition = NULL;
ivi_layout_layer_get_position(layer, &start_pos_x, &start_pos_y);
transition = create_move_layer_transition(
layer,
start_pos_x, start_pos_y,

16
ivi-shell/ivi-layout.c
Unescape View File

@ -1906,21 +1906,6 @@ ivi_layout_layer_set_dimension(struct ivi_layout_layer *ivilayer,
return IVI_SUCCEEDED;
}
int32_t
ivi_layout_layer_get_position(struct ivi_layout_layer *ivilayer,
int32_t *dest_x, int32_t *dest_y)
{
if (ivilayer == NULL || dest_x == NULL || dest_y == NULL) {
weston_log("ivi_layout_layer_get_position: invalid argument\n");
return IVI_FAILED;
}
*dest_x = ivilayer->prop.dest_x;
*dest_y = ivilayer->prop.dest_y;
return IVI_SUCCEEDED;
}
int32_t
ivi_layout_layer_set_position(struct ivi_layout_layer *ivilayer,
int32_t dest_x, int32_t dest_y)
@ -2721,7 +2706,6 @@ static struct ivi_layout_interface ivi_layout_interface = {
.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,
.layer_get_position = ivi_layout_layer_get_position,
.layer_set_dimension = ivi_layout_layer_set_dimension,
.layer_get_dimension = ivi_layout_layer_get_dimension,
.layer_set_orientation = ivi_layout_layer_set_orientation,

33
tests/ivi_layout-internal-test.c
Unescape View File

@ -281,31 +281,21 @@ test_layer_position(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;
int32_t dest_x;
int32_t dest_y;
ivilayer = lyt->layer_create_with_dimension(IVI_TEST_LAYER_ID(0), 200, 300);
iassert(ivilayer != NULL);
iassert(lyt->layer_get_position(
ivilayer, &dest_x, &dest_y) == IVI_SUCCEEDED);
iassert(dest_x == 0);
iassert(dest_y == 0);
prop = lyt->get_properties_of_layer(ivilayer);
iassert(prop->dest_x == 0);
iassert(prop->dest_y == 0);
iassert(lyt->layer_set_position(ivilayer, 20, 30) == IVI_SUCCEEDED);
iassert(lyt->layer_get_position(
ivilayer, &dest_x, &dest_y) == IVI_SUCCEEDED);
iassert(dest_x == 0);
iassert(dest_y == 0);
iassert(prop->dest_x == 0);
iassert(prop->dest_y == 0);
lyt->commit_changes();
iassert(lyt->layer_get_position(
ivilayer, &dest_x, &dest_y) == IVI_SUCCEEDED);
iassert(dest_x == 20);
iassert(dest_y == 30);
prop = lyt->get_properties_of_layer(ivilayer);
iassert(prop->dest_x == 20);
iassert(prop->dest_y == 30);
@ -321,8 +311,6 @@ test_layer_destination_rectangle(struct test_context *ctx)
const struct ivi_layout_layer_properties *prop;
int32_t dest_width;
int32_t dest_height;
int32_t dest_x;
int32_t dest_y;
ivilayer = lyt->layer_create_with_dimension(IVI_TEST_LAYER_ID(0), 200, 300);
iassert(ivilayer != NULL);
@ -349,11 +337,6 @@ test_layer_destination_rectangle(struct test_context *ctx)
iassert(dest_width == 400);
iassert(dest_height == 600);
iassert(lyt->layer_get_position(
ivilayer, &dest_x, &dest_y) == IVI_SUCCEEDED);
iassert(dest_x == 20);
iassert(dest_y == 30);
prop = lyt->get_properties_of_layer(ivilayer);
iassert(prop->dest_width == 400);
iassert(prop->dest_height == 600);
@ -507,8 +490,6 @@ test_layer_bad_position(struct test_context *ctx)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
struct ivi_layout_layer *ivilayer;
int32_t dest_x;
int32_t dest_y;
ivilayer = lyt->layer_create_with_dimension(IVI_TEST_LAYER_ID(0), 200, 300);
iassert(ivilayer != NULL);
@ -517,10 +498,6 @@ test_layer_bad_position(struct test_context *ctx)
lyt->commit_changes();
iassert(lyt->layer_get_position(NULL, &dest_x, &dest_y) == IVI_FAILED);
iassert(lyt->layer_get_position(ivilayer, NULL, &dest_y) == IVI_FAILED);
iassert(lyt->layer_get_position(ivilayer, &dest_x, NULL) == IVI_FAILED);
lyt->layer_destroy(ivilayer);
}

Write Preview
Loading…
Cancel
Save