, __startTouchPoint(0.0f, 0.0f)
, __animationing(false)
, __touchPressed(false)
+ , __quickpanelOpened(false)
{
}
r = ChangeCurrentVisualElement(__pLandscapeVisualElement);
}
- Ecore_Evas *pPortraitEe = ecore_evas_object_ecore_evas_get(__pPortraitIndicatorEvasObject);
+ Ecore_Evas* pPortraitEe = ecore_evas_object_ecore_evas_get(__pPortraitIndicatorEvasObject);
SysTryReturn(NID_UI_CTRL, pPortraitEe, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Unable to get evas.");
- Ecore_Evas *pLandscapeEe = ecore_evas_object_ecore_evas_get(__pLandscapeIndicatorEvasObject);
+ Ecore_Evas* pLandscapeEe = ecore_evas_object_ecore_evas_get(__pLandscapeIndicatorEvasObject);
SysTryReturn(NID_UI_CTRL, pLandscapeEe, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Unable to get evas.");
ecore_evas_data_set(pPortraitEe, pPortPublicKey, __pPortraitIndicatorEvasObject);
}
}
- Ecore_Evas *pPortraitEe = ecore_evas_object_ecore_evas_get(__pPortraitIndicatorEvasObject);
- Ecore_Evas *pLandscapeEe = ecore_evas_object_ecore_evas_get(__pLandscapeIndicatorEvasObject);
+ Ecore_Evas* pPortraitEe = ecore_evas_object_ecore_evas_get(__pPortraitIndicatorEvasObject);
+ Ecore_Evas* pLandscapeEe = ecore_evas_object_ecore_evas_get(__pLandscapeIndicatorEvasObject);
if (pPortraitEe)
{
}
void
-_Indicator::OnDisconnected(Ecore_Evas *pEe)
+_Indicator::OnDisconnected(Ecore_Evas* pEe)
{
_Indicator* pIndicator = (_Indicator*)ecore_evas_data_get(pEe, pIndicatorKey);
SysTryReturnVoidResult(NID_UI_CTRL, pIndicator, E_SYSTEM, "[E_SYSTEM] Unable to get Indicator Object");
}
void
-_Indicator::OnMessageHandle(Ecore_Evas *pEe, int msgDomain, int msgId, void *data, int size)
+_Indicator::OnMessageHandle(Ecore_Evas* pEe, int msgDomain, int msgId, void *data, int size)
{
if (!data)
{
{
if (msgId == MSG_ID_INDICATOR_REPEAT_EVENT)
{
- int *repeat = (int*)data;
+ int* repeat = (int*)data;
if (1 == *repeat)
{
if (pPortraitIndicatorEvasObject)
if (pData->xwin == win)
{
- pIndicator->ShowIndicatorEffect(true, pData->duration);
+ if (pIndicator->__orientation == _CONTROL_ORIENTATION_PORTRAIT)
+ {
+ if (pIndicator->__portraitautohide)
+ {
+ pIndicator->ShowIndicatorEffect(true, pData->duration);
+ }
+ }
+ else
+ {
+ if (pIndicator->__landscapeautohide)
+ {
+ pIndicator->ShowIndicatorEffect(true, pData->duration);
+ }
+ }
}
}
SysTryReturnResult(NID_UI_CTRL, pSlideAnimation, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
pSlideAnimation->SetDuration(duration);
- pSlideAnimation->SetPropertyName( L"bounds.position");
+ pSlideAnimation->SetPropertyName(L"bounds.position");
pSlideAnimation->SetVisualElementAnimationStatusEventListener(this);
float indicatorHeight = 0.0f;
SysTryReturnResult(NID_UI_CTRL, pUserData, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
}
pSlideAnimation->SetUserData((void*)(pUserData));
- AddAnimation( L"bounds.position", *pSlideAnimation);
+ AddAnimation(L"bounds.position", *pSlideAnimation);
delete pSlideAnimation;
}
else
{
- __startTouchPoint = touchinfo.GetCurrentPosition();
+ __startTouchPoint = touchPosition;
__touchPressed = true;
__pointId = pointId;
}
}
}
- if (pTouchManager->IsListenerOnly(pointId) == true )
+ if (pTouchManager->IsListenerOnly(pointId) == true)
{
return true;
}
if (pTouchManager->IsListenerOnly(touchinfo.GetPointId()) == true)
{
+ _TouchManager* pTouchManager = _TouchManager::GetInstance();
+ if (pTouchManager)
+ {
+ if(pTouchManager->GetTouchControlSource() == &source)
+ {
+ SysLog(NID_UI, "VisibleState changed false, Call SetTouchCanceled");
+ pTouchManager->SetTouchCanceled(null);
+ }
+ }
return true;
}
else
return false;
}
}
+ else if (__quickpanelOpened == true)
+ {
+ OnChangeLayout(__orientation);
+ __quickpanelOpened = false;
+ }
return false;
}
if (__touchPressed)
{
- FloatPoint touchPoint = touchinfo.GetCurrentPosition();
+ FloatPoint touchPoint = source.ConvertToScreenPosition(touchinfo.GetCurrentPosition());
float gap = touchPoint.y - __startTouchPoint.y;
int touchGap = 0;
}
else
{
+ if (__pAnimationTimer)
+ {
+ __pAnimationTimer->Cancel();
+ }
+ __quickpanelOpened = true;
+ __animationing = false;
r = false;
}
return r;
void
_Indicator::OnVisualElementAnimationFinished(const Tizen::Ui::Animations::VisualElementAnimation& animation, const Tizen::Base::String& keyName, Tizen::Ui::Animations::VisualElement& target, bool completedNormally)
{
+ const FloatDimension portraitSize = _ControlManager::GetInstance()->_ControlManager::GetScreenSizeF();
+ const FloatDimension landscapeSize = FloatDimension(portraitSize.height, portraitSize.width);
+
String* pUserData = (String*) animation.GetUserData();
if ((pUserData != null) && (*pUserData == String(L"UpAnimation")))
int indicatorHeight = 0;
GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, __pWindow->GetOrientation(), indicatorHeight);
- SetBounds(FloatRectangle(0.0f, 0.0f, GetIndicatorBoundsF().width, indicatorHeight));
if (__orientation == _CONTROL_ORIENTATION_PORTRAIT)
{
__pPortraitVisualElement->SetShowState(false);
}
}
+ SetBounds(FloatRectangle(0.0f, 0.0f, portraitSize.width, indicatorHeight));
}
else
{
__pLandscapeVisualElement->SetShowState(false);
}
}
+ SetBounds(FloatRectangle(0.0f, 0.0f, landscapeSize.width, indicatorHeight));
}
delete pUserData;
}