From 1d784d083e0c864057e146f3227bb16057faf0aa Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Wed, 13 Feb 2019 17:16:03 +0900 Subject: [PATCH 1/1] Add EmitKeyInputFocusSignal to control-wrapper-impl Fix TCT block issue Change-Id: I97c54c89c6d9216a4a8908959d7f0d35e3029603 Signed-off-by: huiyu.eun --- .../src/dali-toolkit/utc-Dali-ControlWrapper.cpp | 29 ++++++++++++++++++++++ .../devel-api/controls/control-wrapper-impl.cpp | 5 ++++ 2 files changed, 34 insertions(+) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp index 8e1673e..0921d61 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp @@ -51,6 +51,15 @@ void utc_dali_toolkit_control_wrapper_cleanup(void) namespace { bool gOnRelayout = false; + +static bool gKeyInputFocusCallBackCalled; + +static void TestKeyInputFocusCallback( Control control ) +{ + tet_infoline(" TestKeyInputFocusCallback"); + + gKeyInputFocusCallBackCalled = true; +} } // namespace /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -810,3 +819,23 @@ int UtcDaliControlWrapperAnimateVisual(void) END_TEST; } + +int UtcDaliControlWrapperEmitKeyFocusSignal(void) +{ + ToolkitTestApplication application; + + Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT ); + ControlWrapper controlWrapper = ControlWrapper::New( customControlTypeName, *controlWrapperImpl ); + + gKeyInputFocusCallBackCalled = false; + controlWrapper.KeyInputFocusGainedSignal().Connect(&TestKeyInputFocusCallback); + + application.SendNotification(); + application.Render(); + + controlWrapperImpl->EmitKeyInputFocusSignal( true ); + + DALI_TEST_CHECK( gKeyInputFocusCallBackCalled ); + + END_TEST; +} \ No newline at end of file diff --git a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp index 37def2b..1a2ec4b 100755 --- a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp +++ b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp @@ -185,6 +185,11 @@ Dali::TypeInfo ControlWrapper::GetTypeInfo() return DevelCustomActor::GetTypeInfo(Self()); } +void ControlWrapper::EmitKeyInputFocusSignal( bool focusGained ) +{ + Control::EmitKeyInputFocusSignal( focusGained ); +} + } // namespace Internal } // namespace Toolkit -- 2.7.4