X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdummy-control.h;h=779100689bba39ed037feb54310ad997f1b24b9a;hp=96f10b24edc0bb08e95ffc30f92d78d16191ca75;hb=2d28c6d452610ada10e3639a77022ef60f2f33af;hpb=1846ed9e60412dbb8aab06aa6bd7c0027d242ac0 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h index 96f10b2..7791006 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h @@ -72,10 +72,9 @@ public: inline LongPressGestureDetector GetLongPressGestureDetector() const { return Internal::Control::GetLongPressGestureDetector(); } // Used to test signal connections - void CustomSlot1( Actor actor, const Vector3& value ); + void CustomSlot1( Actor actor ); bool mCustomSlot1Called; - Vector3 mCustomSlot1Value; protected: @@ -103,8 +102,8 @@ private: private: // From Internal::Control virtual void OnInitialize(); - virtual void OnThemeChange( StyleManager styleManager ); - virtual void OnFontChange(bool defaultFontChange, bool defaultFontSizeChange); + virtual void OnActivated(); + virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); virtual void OnPinch(const PinchGesture& pinch); virtual void OnPan(const PanGesture& pan); virtual void OnTap(const TapGesture& tap); @@ -119,6 +118,7 @@ private: // From CustomActorImpl virtual void OnSizeSet(const Vector3& targetSize); virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize); virtual bool OnTouchEvent(const TouchEvent& event); + virtual bool OnHoverEvent(const HoverEvent& event); virtual bool OnMouseWheelEvent(const MouseWheelEvent& event); virtual bool OnKeyEvent(const KeyEvent& event); virtual void OnKeyInputFocusGained(); @@ -127,6 +127,7 @@ private: // From CustomActorImpl public: bool initializeCalled; + bool activatedCalled; bool themeChangeCalled; bool fontChangeCalled; bool pinchCalled; @@ -140,6 +141,7 @@ public: bool sizeSetCalled; bool sizeAnimationCalled; bool touchEventCalled; + bool hoverEventCalled; bool mouseWheelEventCalled; bool keyEventCalled; bool keyInputFocusGained;