, __pTextFont(null)
, __pDescriptionTextObject(null)
, __pTitleTextObject(null)
- , __pBouncingEffectVe(null)
+ , __pDividerVe(null)
, __flickAnimation()
, __moveDistance(0.0f)
, __flickMove(0.0f)
__pTitleTextObject = null;
}
- if (__pBouncingEffectVe)
+ if (__pDividerVe)
{
- __pBouncingEffectVe->RemoveAllAnimations();
- __pBouncingEffectVe->Destroy();
- __pBouncingEffectVe = null;
+ __pDividerVe->RemoveAllAnimations();
+ __pDividerVe->Destroy();
+ __pDividerVe = null;
}
}
Canvas * pCanvas = null;
int Z_ORDER_GROUP_CONTROL = 2001;
- if (__pBouncingEffectVe == null)
+ if (__pDividerVe == null)
{
- __pBouncingEffectVe = new (std::nothrow) VisualElement();
- SysTryReturnVoidResult(NID_UI_CTRL, __pBouncingEffectVe, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+ __pDividerVe = new (std::nothrow) VisualElement();
+ SysTryReturnVoidResult(NID_UI_CTRL, __pDividerVe, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
- __pBouncingEffectVe->Construct();
- __pBouncingEffectVe->SetName(L"BouncingEffect");
+ __pDividerVe->Construct();
+ __pDividerVe->SetName(L"DividerEffect");
}
- __pBouncingEffectVe->SetBounds(FloatRectangle(0.0f, 0.0f, __pToolbar->GetBoundsF().width, __pToolbar->GetBoundsF().height));
- __pBouncingEffectVe->SetShowState(true);
- __pBouncingEffectVe->SetImplicitAnimationEnabled(false);
+ __pDividerVe->SetBounds(FloatRectangle(0.0f, 0.0f, __pToolbar->GetBoundsF().width, __pToolbar->GetBoundsF().height));
+ __pDividerVe->SetShowState(true);
+ __pDividerVe->SetImplicitAnimationEnabled(false);
- _VisualElementImpl::GetInstance(*__pBouncingEffectVe)->SetZOrderGroup(Z_ORDER_GROUP_CONTROL + 1);
- __pToolbar->GetVisualElement()->AttachChild(*__pBouncingEffectVe);
+ _VisualElementImpl::GetInstance(*__pDividerVe)->SetZOrderGroup(Z_ORDER_GROUP_CONTROL + 1);
+ __pToolbar->GetVisualElement()->AttachChild(*__pDividerVe);
- pCanvas = __pBouncingEffectVe->GetCanvasN();
+ pCanvas = __pDividerVe->GetCanvasN();
if (!pCanvas)
{
- __pBouncingEffectVe->Destroy();
- __pBouncingEffectVe = null;
+ __pDividerVe->Destroy();
+ __pDividerVe = null;
SysLog(NID_UI_CTRL, "[%s] Propagating.", GetErrorMessage(GetLastResult()));
pPressedButton->SetButtonStatus(_BUTTON_STATUS_PRESSED);
}
- __pToolbar->Invalidate(true);
+ if (__titlePressed)
+ {
+ __pToolbar->Invalidate(false);
+ }
+ else
+ {
+ __pToolbar->Invalidate(true);
+ }
return true;
}
}
}
- __pToolbar->Invalidate(true);
+ if (__titlePressed)
+ {
+ __pToolbar->Invalidate(false);
+ }
+ else
+ {
+ __pToolbar->Invalidate(true);
+ }
return true;
}
}
// Update children
- __pToolbar->Invalidate(true);
+ if (__titlePressed)
+ {
+ __pToolbar->Invalidate(false);
+ }
+ else
+ {
+ __pToolbar->Invalidate(true);
+ }
return true;
}
}
}
- __pToolbar->Invalidate(true);
+ if (__titlePressed)
+ {
+ __pToolbar->Invalidate(false);
+ }
+ else
+ {
+ __pToolbar->Invalidate(true);
+ }
return true;
}
}
// Update children
- __pToolbar->Invalidate(true);
+ if (__titlePressed)
+ {
+ __pToolbar->Invalidate(false);
+ }
+ else
+ {
+ __pToolbar->Invalidate(true);
+ }
return true;
}
projects / platform / framework / native / uifw.git / commitdiff
