projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed On(...)Event()
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
dummy-control.h
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
87b9748
..
0b257a1
100644
(file)
--- 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
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_TEST_DUMMY_CONTROL_H
/*
#define DALI_TOOLKIT_TEST_DUMMY_CONTROL_H
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-90,8
+90,8
@@
public:
static DummyControl New();
public:
static DummyControl New();
public:
- inline void EnableGestureDetection(Gesture
::Typ
e type) { Internal::Control::EnableGestureDetection(type); }
- inline void DisableGestureDetection(Gesture
::Typ
e type) { Internal::Control::DisableGestureDetection(type); }
+ inline void EnableGestureDetection(Gesture
Type::Valu
e type) { Internal::Control::EnableGestureDetection(type); }
+ inline void DisableGestureDetection(Gesture
Type::Valu
e type) { Internal::Control::DisableGestureDetection(type); }
inline PinchGestureDetector GetPinchGestureDetector() const { return Internal::Control::GetPinchGestureDetector(); }
inline PanGestureDetector GetPanGestureDetector() const { return Internal::Control::GetPanGestureDetector(); }
inline TapGestureDetector GetTapGestureDetector() const { return Internal::Control::GetTapGestureDetector(); }
inline PinchGestureDetector GetPinchGestureDetector() const { return Internal::Control::GetPinchGestureDetector(); }
inline PanGestureDetector GetPanGestureDetector() const { return Internal::Control::GetPanGestureDetector(); }
inline TapGestureDetector GetTapGestureDetector() const { return Internal::Control::GetTapGestureDetector(); }
@@
-154,7
+154,6
@@
private: // From Internal::Control
virtual void OnInitialize();
virtual bool OnAccessibilityActivated();
virtual void OnInitialize();
virtual bool OnAccessibilityActivated();
- virtual bool OnAccessibilityTouch( const TouchEvent& touchEvent );
virtual bool OnAccessibilityValueChange( bool isIncrease );
virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
virtual bool OnAccessibilityValueChange( bool isIncrease );
virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
@@
-163,6
+162,7
@@
private: // From Internal::Control
virtual void OnTap(const TapGesture& tap);
virtual void OnLongPress(const LongPressGesture& longPress);
virtual Vector3 GetNaturalSize();
virtual void OnTap(const TapGesture& tap);
virtual void OnLongPress(const LongPressGesture& longPress);
virtual Vector3 GetNaturalSize();
+ virtual bool OnKeyEvent(const KeyEvent& event);
private: // From CustomActorImpl
private: // From CustomActorImpl
@@
-172,10
+172,6
@@
private: // From CustomActorImpl
virtual void OnChildRemove(Actor& child);
virtual void OnSizeSet(const Vector3& targetSize);
virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize);
virtual void OnChildRemove(Actor& child);
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 OnWheelEvent(const WheelEvent& event);
- virtual bool OnKeyEvent(const KeyEvent& event);
virtual void OnKeyInputFocusGained();
virtual void OnKeyInputFocusLost();
virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
virtual void OnKeyInputFocusGained();
virtual void OnKeyInputFocusLost();
virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
@@
-187,7
+183,6
@@
public:
bool initializeCalled;
bool activatedCalled;
bool initializeCalled;
bool activatedCalled;
- bool onAccTouchedCalled;
bool onAccValueChangeCalled;
bool themeChangeCalled;
bool fontChangeCalled;
bool onAccValueChangeCalled;
bool themeChangeCalled;
bool fontChangeCalled;
@@
-201,7
+196,6
@@
public:
bool childRemoveCalled;
bool sizeSetCalled;
bool sizeAnimationCalled;
bool childRemoveCalled;
bool sizeSetCalled;
bool sizeAnimationCalled;
- bool touchEventCalled;
bool hoverEventCalled;
bool wheelEventCalled;
bool keyEventCalled;
bool hoverEventCalled;
bool wheelEventCalled;
bool keyEventCalled;