From d03a8841d36cb0f286c31b2ed2016f779e1b7526 Mon Sep 17 00:00:00 2001 From: HeeJu Kang Date: Sun, 17 Feb 2013 16:50:56 +0900 Subject: [PATCH] Opacify animation removed Change-Id: Iea270051c50e805439d14550b9503b76076f21b1 Signed-off-by: HeeJu Kang --- src/FShell_LiveboxFrame.cpp | 18 +++++++++--------- src/FShell_LiveboxPopup.cpp | 19 ++++++++++--------- src/FShell_LiveboxPopupView.cpp | 4 ++-- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/FShell_LiveboxFrame.cpp b/src/FShell_LiveboxFrame.cpp index b94ccc1..f76c774 100644 --- a/src/FShell_LiveboxFrame.cpp +++ b/src/FShell_LiveboxFrame.cpp @@ -130,6 +130,15 @@ _LiveboxFrame::Initialize(const Dimension& size) __pLiveboxLayer = move(pLayer); __pLiveboxFrameRootVisualElement = __pLiveboxLayer->GetRootVisualElement(); + + _VisualElement* pVisualElement = GetVisualElement(); + r = GetLastResult(); + SysTryReturn(NID_UI_CTRL, pVisualElement, r, r, "[%s] Propagating.", GetErrorMessage(r)); + + pVisualElement->SetClipChildrenEnabled(false); + pVisualElement->SetShowState(true); + + __pLiveboxFrameRootVisualElement->AttachChild(*pVisualElement); #endif // MULTI_WINDOW Rectangle bounds(0, 0, liveboxSize.width, liveboxSize.height); @@ -149,17 +158,8 @@ _LiveboxFrame::Initialize(const Dimension& size) __pLiveboxFrameRootVisualElement->SetBounds(fBounds); __pLiveboxFrameRootVisualElement->SetShowState(false); - _VisualElement* pVisualElement = GetVisualElement(); - r = GetLastResult(); - SysTryReturn(NID_UI_CTRL, pVisualElement, r, r, "[%s] Propagating.", GetErrorMessage(r)); - - __pLiveboxFrameRootVisualElement->AttachChild(*pVisualElement); - SetBackgroundColor(Color(0, 0, 0, 0)); - pVisualElement->SetClipChildrenEnabled(false); - pVisualElement->SetShowState(true); - r = __pEventManager->RegisterTouchEventHandler(*this); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/FShell_LiveboxPopup.cpp b/src/FShell_LiveboxPopup.cpp index acb1d71..fe5b9cd 100644 --- a/src/FShell_LiveboxPopup.cpp +++ b/src/FShell_LiveboxPopup.cpp @@ -204,6 +204,16 @@ _LiveboxPopup::Initialize(const Dimension& size) __pLiveboxPopupLayer = move(pLayer); __pLiveboxPopupRootVisualElement = __pLiveboxPopupLayer->GetRootVisualElement(); + + _VisualElement* pVisualElement = GetVisualElement(); + r = GetLastResult(); + SysTryReturn(NID_UI_CTRL, pVisualElement, r, r, "[%s] Propagating.", GetErrorMessage(r)); + + pVisualElement->SetClipChildrenEnabled(false); + pVisualElement->SetShowState(true); + pVisualElement->SetRenderOperation(_VisualElement::RENDER_OPERATION_COPY); + + __pLiveboxPopupRootVisualElement->AttachChild(*pVisualElement); #endif // MULTI_WINDOW Rectangle bounds(0, 0, size.width, size.height); @@ -223,17 +233,8 @@ _LiveboxPopup::Initialize(const Dimension& size) __pLiveboxPopupRootVisualElement->SetBounds(fBounds); __pLiveboxPopupRootVisualElement->SetShowState(false); - _VisualElement* pVisualElement = GetVisualElement(); - r = GetLastResult(); - SysTryReturn(NID_UI_CTRL, pVisualElement, r, r, "[%s] Propagating.", GetErrorMessage(r)); - - __pLiveboxPopupRootVisualElement->AttachChild(*pVisualElement); - SetBackgroundColor(Color(0, 0, 0, 0)); - pVisualElement->SetClipChildrenEnabled(false); - pVisualElement->SetShowState(true); - __pEventManager->RegisterTouchEventHandler(*this); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/FShell_LiveboxPopupView.cpp b/src/FShell_LiveboxPopupView.cpp index f8f4dc5..82bc204 100644 --- a/src/FShell_LiveboxPopupView.cpp +++ b/src/FShell_LiveboxPopupView.cpp @@ -252,7 +252,7 @@ _LiveboxPopupView::PlayAnimation(bool open) animation1.SetDuration(ANIMATION1_DURATION); animationGroup.AddAnimation(animation1); - +/* float startOpacity = 0.0f; float endOpacity = 1.0f; if (!open) @@ -268,7 +268,7 @@ _LiveboxPopupView::PlayAnimation(bool open) animation2.SetDuration(ANIMATION2_DURATION); animationGroup.AddAnimation(animation2); - +*/ String keyName = (open) ? OPEN_ANIMATION : CLOSE_ANIMATION; pVisualElement->AddAnimation(keyName, animationGroup); } -- 2.7.4