[PATCH weston 6/9] ivi-shell: remove start rectangle from ivi_layout_surface
Emre Ucan
eucan at de.adit-jv.com
Wed May 23 08:27:21 UTC 2018
it is always equal to destination rectangle.
Therefore, we can remove it
Signed-off-by: Emre Ucan <eucan at de.adit-jv.com>
---
ivi-shell/ivi-layout-export.h | 4 ----
ivi-shell/ivi-layout-transition.c | 8 ++++----
ivi-shell/ivi-layout.c | 4 ----
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index 06535bf..834b906 100644
--- a/ivi-shell/ivi-layout-export.h
+++ b/ivi-shell/ivi-layout-export.h
@@ -75,10 +75,6 @@ struct ivi_layout_surface_properties
int32_t source_y;
int32_t source_width;
int32_t source_height;
- int32_t start_x;
- int32_t start_y;
- int32_t start_width;
- int32_t start_height;
int32_t dest_x;
int32_t dest_y;
int32_t dest_width;
diff --git a/ivi-shell/ivi-layout-transition.c b/ivi-shell/ivi-layout-transition.c
index f700f74..cb11a01 100644
--- a/ivi-shell/ivi-layout-transition.c
+++ b/ivi-shell/ivi-layout-transition.c
@@ -404,13 +404,13 @@ ivi_layout_transition_move_resize_view(struct ivi_layout_surface *surface,
{
struct ivi_layout_transition *transition;
int32_t start_pos[2] = {
- surface->pending.prop.start_x,
- surface->pending.prop.start_y
+ surface->prop.dest_x,
+ surface->prop.dest_y
};
int32_t start_size[2] = {
- surface->pending.prop.start_width,
- surface->pending.prop.start_height
+ surface->prop.dest_width,
+ surface->prop.dest_height
};
transition = get_transition_from_type_and_id(
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 548b3a3..b9c21bb 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -1469,12 +1469,8 @@ ivi_layout_surface_set_destination_rectangle(struct ivi_layout_surface *ivisurf,
}
prop = &ivisurf->pending.prop;
- prop->start_x = prop->dest_x;
- prop->start_y = prop->dest_y;
prop->dest_x = x;
prop->dest_y = y;
- prop->start_width = prop->dest_width;
- prop->start_height = prop->dest_height;
prop->dest_width = width;
prop->dest_height = height;
--
2.7.4
More information about the wayland-devel
mailing list