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
[dali_1.1.40] Merge branch 'devel/master'
[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
ba0469d
..
a7e0b46
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
@@
-15,9
+15,12
@@
*
*/
*
*/
+// HEADER
#include "toolkit-style-monitor.h"
#include "toolkit-style-monitor.h"
+// EXTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/signals/dali-signal.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/signals/dali-signal.h>
@@
-40,6
+43,19
@@
const char* DEFAULT_THEME=
" }\n"
"}\n";
" }\n"
"}\n";
+struct NamedTheme
+{
+ NamedTheme( const std::string& name, const std::string& theme )
+ : name(name), theme(theme)
+ {
+ }
+
+ std::string name;
+ std::string theme;
+};
+typedef std::vector< NamedTheme > NamedThemes;
+NamedThemes gThemes;
+
std::string gTheme;
std::string gFontFamily = Dali::StyleMonitor::DEFAULT_FONT_FAMILY;
std::string gFontStyle = Dali::StyleMonitor::DEFAULT_FONT_STYLE;
std::string gTheme;
std::string gFontFamily = Dali::StyleMonitor::DEFAULT_FONT_FAMILY;
std::string gFontStyle = Dali::StyleMonitor::DEFAULT_FONT_STYLE;
@@
-81,9
+97,8
@@
public: // Signals
private:
Dali::StyleMonitor::StyleChangeSignalType mStyleChangeSignal;
static Dali::StyleMonitor mToolkitStyleMonitor;
private:
Dali::StyleMonitor::StyleChangeSignalType mStyleChangeSignal;
static Dali::StyleMonitor mToolkitStyleMonitor;
- std::string mTheme;
- std::string m
Output; //<<< Test output. Use SetThemeFileOutput in a testharness to use it.
+ std::string m
Theme; ///<< Current theme name
};
Dali::StyleMonitor StyleMonitor::mToolkitStyleMonitor;
};
Dali::StyleMonitor StyleMonitor::mToolkitStyleMonitor;
@@
-135,6
+150,16
@@
void StyleMonitor::SetTheme(std::string path)
bool StyleMonitor::LoadThemeFile( const std::string& filename, std::string& output )
{
bool StyleMonitor::LoadThemeFile( const std::string& filename, std::string& output )
{
+ for( NamedThemes::iterator iter = gThemes.begin(); iter != gThemes.end(); ++iter )
+ {
+ NamedTheme& theme = *iter;
+ if( theme.name == filename )
+ {
+ output = theme.theme;
+ return true;
+ }
+ }
+
if( !gTheme.empty() )
{
output = gTheme;
if( !gTheme.empty() )
{
output = gTheme;
@@
-246,9
+271,19
@@
namespace Test
namespace StyleMonitor
{
namespace StyleMonitor
{
-void SetThemeFileOutput( const std::string& output )
+void SetThemeFileOutput( const std::string&
name, const std::string&
output )
{
{
- gTheme = output;
+ for( NamedThemes::iterator iter = gThemes.begin(); iter != gThemes.end(); ++iter )
+ {
+ NamedTheme& theme = *iter;
+ if( theme.name == name )
+ {
+ theme.theme = output;
+ return;
+ }
+ }
+
+ gThemes.push_back( NamedTheme( name, output ) );
}
void SetDefaultFontFamily(const std::string& family)
}
void SetDefaultFontFamily(const std::string& family)