From 3402a99ed060896d99b8b7182c6192a6af225493 Mon Sep 17 00:00:00 2001 From: abhismita ghosh Date: Tue, 29 Oct 2013 00:49:02 +0530 Subject: [PATCH] N_SE-55531, P131017-02373 Change-Id: I87afd2fee655567b93ab009bc76e4a88be16ab54 --- src/VpVideoPlayerForm.cpp | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/VpVideoPlayerForm.cpp b/src/VpVideoPlayerForm.cpp index c46ebde..c42ec9f 100644 --- a/src/VpVideoPlayerForm.cpp +++ b/src/VpVideoPlayerForm.cpp @@ -184,6 +184,9 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay) rect.y = (clientRect.height - rect.height) / DIVIDE_BY_TWO; } + bool isModifiedBounds = false; + OverlayPanel::EvaluateBounds(OVERLAY_PANEL_EVAL_OPT_GREATER_THAN, rect, isModifiedBounds); + AppLogDebug("SCREEN_MODE_NORMAL : [%d][%d][%d][%d][rotation:%d]", rect.x, rect.y, rect.width, rect.height, recRotation); if (destroyOverlay == true) @@ -219,6 +222,9 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay) __pOverlayPanel->SetBounds(rect); } + __pOverlayPanel->SetRendererRotation(OverlayPanel::Rotation(recRotation)); + __pOverlayPanel->SetRenderSize(__pOverlayPanel->GetSize()); + SetControlAlwaysAtBottom(*__pOverlayPanel, true); __screenMode = SCREEN_MODE_NORMAL; @@ -229,6 +235,9 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay) { Rectangle rect = Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height); + bool isModifiedBounds = false; + OverlayPanel::EvaluateBounds(OVERLAY_PANEL_EVAL_OPT_GREATER_THAN, rect, isModifiedBounds); + AppLogDebug("SCREEN_MODE_FULL : [%d][%d][%d][%d][rotation:%d]", rect.x, rect.y, rect.width, rect.height, recRotation); if (destroyOverlay == true) @@ -262,11 +271,11 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay) else { __pOverlayPanel->SetBounds(rect); - - Dimension renderSize = __pOverlayPanel->GetSize(); - __pOverlayPanel->SetRenderSize(renderSize); } + __pOverlayPanel->SetRendererRotation(OverlayPanel::Rotation(recRotation)); + __pOverlayPanel->SetRenderSize(__pOverlayPanel->GetSize()); + SetControlAlwaysAtBottom(*__pOverlayPanel, true); __screenMode = SCREEN_MODE_FULL; @@ -303,6 +312,9 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay) rect.y = (clientRect.height - rect.height) / DIVIDE_BY_TWO; } + bool isModifiedBounds = false; + OverlayPanel::EvaluateBounds(OVERLAY_PANEL_EVAL_OPT_GREATER_THAN, rect, isModifiedBounds); + AppLogDebug("SCREEN_MODE_FIT : [%d][%d][%d][%d][rotation:%d]", rect.x, rect.y, rect.width, rect.height, recRotation); if (destroyOverlay == true) @@ -337,6 +349,10 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay) { __pOverlayPanel->SetBounds(rect); } + + __pOverlayPanel->SetRendererRotation(OverlayPanel::Rotation(recRotation)); + __pOverlayPanel->SetRenderSize(__pOverlayPanel->GetSize()); + SetControlAlwaysAtBottom(*__pOverlayPanel, true); __screenMode = SCREEN_MODE_FIT; @@ -918,7 +934,7 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId) { case SCREEN_MODE_FIT: { - r = SetScreenMode(SCREEN_MODE_FULL, true); + r = SetScreenMode(SCREEN_MODE_FULL, false); TryReturnVoid(r == E_SUCCESS, "SetScreenMode() failed:%s", GetErrorMessage(r)); __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel); @@ -930,7 +946,7 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId) case SCREEN_MODE_FULL: { - r = SetScreenMode(SCREEN_MODE_NORMAL, true); + r = SetScreenMode(SCREEN_MODE_NORMAL, false); TryReturnVoid(r == E_SUCCESS, "SetScreenMode() failed:%s", GetErrorMessage(r)); __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel); @@ -944,7 +960,7 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId) { if (rect.width > W_NORMAL || rect.height > W_NORMAL) { - r = SetScreenMode(SCREEN_MODE_FULL, true); + r = SetScreenMode(SCREEN_MODE_FULL, false); TryReturnVoid(r == E_SUCCESS, "SetScreenMode() failed:%s", GetErrorMessage(r)); __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel); @@ -952,7 +968,7 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId) } else { - r = SetScreenMode(SCREEN_MODE_FIT, true); + r = SetScreenMode(SCREEN_MODE_FIT, false); TryReturnVoid(r == E_SUCCESS, "SetScreenMode() failed:%s", GetErrorMessage(r)); __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel); -- 2.7.4