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
(StyleManager) Add style monitor signal into StyleManager
[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
649ac0a
..
40dcf4f
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
@@
-104,7
+104,8
@@
private:
private: // From Internal::Control
virtual void OnInitialize();
private: // From Internal::Control
virtual void OnInitialize();
- virtual void OnStyleChange(StyleChange change);
+ virtual void OnThemeChange( StyleManager styleManager );
+ virtual void OnFontChange(bool defaultFontChange, bool defaultFontSizeChange);
virtual void OnPinch(PinchGesture pinch);
virtual void OnPan(PanGesture pan);
virtual void OnTap(TapGesture tap);
virtual void OnPinch(PinchGesture pinch);
virtual void OnPan(PanGesture pan);
virtual void OnTap(TapGesture tap);
@@
-127,7
+128,8
@@
private: // From CustomActorImpl
public:
bool initializeCalled;
public:
bool initializeCalled;
- bool styleChangeCalled;
+ bool themeChangeCalled;
+ bool fontChangeCalled;
bool pinchCalled;
bool panCalled;
bool tapCalled;
bool pinchCalled;
bool panCalled;
bool tapCalled;