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
Merge "Refactored ControlRenderer so that derived classes are responsible for the...
[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
e77d521
..
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
@@
-19,7
+19,7
@@
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal
-v2
.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
namespace Dali
{
@@
-46,15
+46,15
@@
public: // Style Information
void SetTheme(std::string theme);
public: // Signals
void SetTheme(std::string theme);
public: // Signals
- Dali::StyleMonitor::StyleChangeSignal
V2
& StyleChangeSignal();
+ Dali::StyleMonitor::StyleChangeSignal
Type
& StyleChangeSignal();
- void EmitStyleChangeSignal(StyleChange styleChange)
+ void EmitStyleChangeSignal(StyleChange
::Type
styleChange)
{
mStyleChangeSignal.Emit(Dali::StyleMonitor(this), styleChange);
}
private:
{
mStyleChangeSignal.Emit(Dali::StyleMonitor(this), styleChange);
}
private:
- Dali::StyleMonitor::StyleChangeSignal
V2
mStyleChangeSignal;
+ Dali::StyleMonitor::StyleChangeSignal
Type
mStyleChangeSignal;
static Dali::StyleMonitor mToolkitStyleMonitor;
std::string mTheme;
};
static Dali::StyleMonitor mToolkitStyleMonitor;
std::string mTheme;
};
@@
-96,14
+96,11
@@
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::StyleChangeSignal
V2
& StyleMonitor::StyleChangeSignal()
+Dali::StyleMonitor::StyleChangeSignal
Type
& StyleMonitor::StyleChangeSignal()
{
return mStyleChangeSignal;
}
{
return mStyleChangeSignal;
}
@@
-165,12
+162,12
@@
void StyleMonitor::SetTheme(std::string themeFilePath)
GetImplementation(*this).SetTheme(themeFilePath);
}
GetImplementation(*this).SetTheme(themeFilePath);
}
-StyleMonitor::StyleChangeSignal
V2
& StyleMonitor::StyleChangeSignal()
+StyleMonitor::StyleChangeSignal
Type
& 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);
}