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
UTC added for Text, Multi-language.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-style-monitor.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
index
dc2d39f
..
65750c1
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
@@
-48,7
+48,7
@@
public: // Style Information
public: // Signals
Dali::StyleMonitor::StyleChangeSignalType& StyleChangeSignal();
public: // Signals
Dali::StyleMonitor::StyleChangeSignalType& StyleChangeSignal();
- void EmitStyleChangeSignal(StyleChange styleChange)
+ void EmitStyleChangeSignal(StyleChange
::Type
styleChange)
{
mStyleChangeSignal.Emit(Dali::StyleMonitor(this), styleChange);
}
{
mStyleChangeSignal.Emit(Dali::StyleMonitor(this), styleChange);
}
@@
-96,11
+96,8
@@
const std::string& StyleMonitor::GetTheme() const
void StyleMonitor::SetTheme(std::string path)
{
void StyleMonitor::SetTheme(std::string path)
{
- StyleChange styleChange;
- styleChange.themeChange = true;
- styleChange.themeFilePath = path;
mTheme = path;
mTheme = path;
- EmitStyleChangeSignal(
styleChange
);
+ EmitStyleChangeSignal(
StyleChange::THEME_CHANGE
);
}
Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
}
Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
@@
-170,7
+167,7
@@
StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
return GetImplementation(*this).StyleChangeSignal();
}
return GetImplementation(*this).StyleChangeSignal();
}
-void StyleMonitor::EmitStyleChangeSignal(StyleChange styleChange)
+void StyleMonitor::EmitStyleChangeSignal(StyleChange
::Type
styleChange)
{
GetImplementation(*this).EmitStyleChangeSignal(styleChange);
}
{
GetImplementation(*this).EmitStyleChangeSignal(styleChange);
}