[weston,4/9] ivi-shell: remove VIEW_FADE_ONLY transition

Submitted by Ucan, Emre (ADITG/ESB) on May 23, 2018, 8:25 a.m.

Details

Message ID 1527063943-13297-5-git-send-email-eucan@de.adit-jv.com
State New
Series "Transition rework part 1"
Headers show

Commit Message

Ucan, Emre (ADITG/ESB) May 23, 2018, 8:25 a.m.
we can use VIEW_FADE transition instead

Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
---
 ivi-shell/hmi-controller.c    | 2 +-
 ivi-shell/ivi-layout-export.h | 1 -
 ivi-shell/ivi-layout.c        | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c
index f8858c5..ed2ddb2 100644
--- a/ivi-shell/hmi-controller.c
+++ b/ivi-shell/hmi-controller.c
@@ -333,7 +333,7 @@  mode_divided_into_sidebyside(struct hmi_controller *hmi_ctrl,
 
 	for (i = idx; i < surf_num; i++) {
 		hmi_ctrl->interface->surface_set_transition(surfaces[i],
-						IVI_LAYOUT_TRANSITION_VIEW_FADE_ONLY,
+						IVI_LAYOUT_TRANSITION_VIEW_FADE,
 						duration);
 		hmi_ctrl->interface->surface_set_visibility(surfaces[i], false);
 	}
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index f84c967..06535bf 100644
--- a/ivi-shell/ivi-layout-export.h
+++ b/ivi-shell/ivi-layout-export.h
@@ -130,7 +130,6 @@  enum ivi_layout_notification_mask {
 enum ivi_layout_transition_type{
 	IVI_LAYOUT_TRANSITION_NONE,
 	IVI_LAYOUT_TRANSITION_VIEW_DEFAULT,
-	IVI_LAYOUT_TRANSITION_VIEW_FADE_ONLY,
 	IVI_LAYOUT_TRANSITION_LAYER_FADE,
 	IVI_LAYOUT_TRANSITION_LAYER_MOVE,
 	IVI_LAYOUT_TRANSITION_VIEW_MOVE_RESIZE,
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 8ff33e7..57c4f3b 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -688,7 +688,7 @@  commit_surface_list(struct ivi_layout *layout)
 			ivisurf->prop.transition_type = IVI_LAYOUT_TRANSITION_NONE;
 			ivisurf->pending.prop.transition_type = IVI_LAYOUT_TRANSITION_NONE;
 
-		} else if (ivisurf->pending.prop.transition_type == IVI_LAYOUT_TRANSITION_VIEW_FADE_ONLY) {
+		} else if (ivisurf->pending.prop.transition_type == IVI_LAYOUT_TRANSITION_VIEW_FADE) {
 			configured = 0;
 			if (ivisurf->pending.prop.visibility) {
 				ivi_layout_transition_visibility_on(ivisurf, ivisurf->pending.prop.transition_duration);