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_2.3.24] 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
c17872b
..
e0000ec
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
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
23
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.
@@
-19,15
+19,21
@@
#include "toolkit-style-monitor.h"
// EXTERNAL INCLUDES
#include "toolkit-style-monitor.h"
// EXTERNAL INCLUDES
-#include <dali
/public-api/common/dali
-common.h>
+#include <dali
-toolkit/public-api/dali-toolkit
-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>
namespace
{
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/signals/dali-signal.h>
namespace
{
-const char* DEFAULT_THEME=
- "{\"styles\":{\n"
+const char* DEFAULT_THEME =
+ "{\n"
+ " \"config\":\n"
+ " {\n"
+ " \"brokenImageUrl\":\"{DALI_IMAGE_DIR}broken.png\"\n"
+ " },\n"
+ " \"styles\":\n"
+ " {\n"
" \"textlabel\":\n"
" {\n"
" \"fontStyle\":{\"weight\":\"normal\"},\n"
" \"textlabel\":\n"
" {\n"
" \"fontStyle\":{\"weight\":\"normal\"},\n"
@@
-38,22
+44,37
@@
const char* DEFAULT_THEME=
struct NamedTheme
{
struct NamedTheme
{
- NamedTheme( const std::string& name, const std::string& theme )
- : name(name), theme(theme)
+ NamedTheme(const std::string& name, const std::string& theme)
+ : name(name),
+ theme(theme)
{
}
std::string name;
std::string theme;
};
{
}
std::string name;
std::string theme;
};
-typedef std::vector<
NamedTheme
> NamedThemes;
-NamedThemes gThemes;
+typedef std::vector<
NamedTheme
> NamedThemes;
+NamedThemes
gThemes;
std::string gTheme;
std::string gFontFamily("LucidaSans");
std::string gFontStyle("Regular");
int gFontSize(1);
std::string gTheme;
std::string gFontFamily("LucidaSans");
std::string gFontStyle("Regular");
int gFontSize(1);
-}
+
+constexpr std::string_view THROW_EXCEPTION_STYLE_FILE_NAME = "throwException";
+class DummyException : public std::exception
+{
+public:
+ DummyException()
+ {
+ }
+
+ const char* what() const throw()
+ {
+ return "DummyException";
+ }
+};
+} // namespace
namespace Dali
{
namespace Dali
{
@@
-72,12
+93,12
@@
public: // Creation & Destruction
~StyleMonitor();
public: // Style Information
~StyleMonitor();
public: // Style Information
- std::string GetDefaultFontFamily() const;
- std::string GetDefaultFontStyle() const;
- float GetDefaultFontSize() const;
+ std::string
GetDefaultFontFamily() const;
+ std::string
GetDefaultFontStyle() const;
+ float
GetDefaultFontSize() const;
const std::string& GetTheme() const;
const std::string& GetTheme() const;
- void SetTheme(std::string theme);
- bool
LoadThemeFile( const std::string& filename, std::string& output
);
+ void
SetTheme(std::string theme);
+ bool
LoadThemeFile(const std::string& filename, std::string& output
);
public: // Signals
Dali::StyleMonitor::StyleChangeSignalType& StyleChangeSignal();
public: // Signals
Dali::StyleMonitor::StyleChangeSignalType& StyleChangeSignal();
@@
-89,18
+110,18
@@
public: // Signals
private:
Dali::StyleMonitor::StyleChangeSignalType mStyleChangeSignal;
private:
Dali::StyleMonitor::StyleChangeSignalType mStyleChangeSignal;
- static Dali::StyleMonitor mToolkitStyleMonitor;
+ static Dali::StyleMonitor
mToolkitStyleMonitor;
- std::string mTheme;
///<< Current theme name
+ std::string mTheme; ///<< Current theme name
};
Dali::StyleMonitor StyleMonitor::mToolkitStyleMonitor;
Dali::StyleMonitor StyleMonitor::Get()
{
};
Dali::StyleMonitor StyleMonitor::mToolkitStyleMonitor;
Dali::StyleMonitor StyleMonitor::Get()
{
- if(
! mToolkitStyleMonitor
)
+ if(
!mToolkitStyleMonitor
)
{
{
- mToolkitStyleMonitor = Dali::StyleMonitor(
new Dali::Internal::Adaptor::StyleMonitor()
);
+ mToolkitStyleMonitor = Dali::StyleMonitor(
new Dali::Internal::Adaptor::StyleMonitor()
);
}
return mToolkitStyleMonitor;
}
}
return mToolkitStyleMonitor;
}
@@
-137,22
+158,27
@@
const std::string& StyleMonitor::GetTheme() const
void StyleMonitor::SetTheme(std::string path)
{
mTheme = path;
void StyleMonitor::SetTheme(std::string path)
{
mTheme = path;
- EmitStyleChangeSignal(
StyleChange::THEME_CHANGE
);
+ EmitStyleChangeSignal(
StyleChange::THEME_CHANGE
);
}
}
-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 )
+ // Throw something exceptions during load file
+ if(filename == THROW_EXCEPTION_STYLE_FILE_NAME)
+ {
+ throw DummyException();
+ }
+ for(NamedThemes::iterator iter = gThemes.begin(); iter != gThemes.end(); ++iter)
{
NamedTheme& theme = *iter;
{
NamedTheme& theme = *iter;
- if(
theme.name == filename
)
+ if(
theme.name == filename
)
{
output = theme.theme;
return true;
}
}
{
output = theme.theme;
return true;
}
}
- if(
!gTheme.empty()
)
+ if(
!gTheme.empty()
)
{
output = gTheme;
}
{
output = gTheme;
}
@@
-232,14
+258,14
@@
StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
return GetImplementation(*this).StyleChangeSignal();
}
return GetImplementation(*this).StyleChangeSignal();
}
-bool StyleMonitor::LoadThemeFile(
const std::string& filename, std::string& output
)
+bool StyleMonitor::LoadThemeFile(
const std::string& filename, std::string& output
)
{
return GetImplementation(*this).LoadThemeFile(filename, output);
}
StyleMonitor& StyleMonitor::operator=(const StyleMonitor& monitor)
{
{
return GetImplementation(*this).LoadThemeFile(filename, output);
}
StyleMonitor& StyleMonitor::operator=(const StyleMonitor& monitor)
{
- if(
*this != monitor
)
+ if(
*this != monitor
)
{
BaseHandle::operator=(monitor);
}
{
BaseHandle::operator=(monitor);
}
@@
-257,20
+283,19
@@
namespace Test
{
namespace StyleMonitor
{
{
namespace StyleMonitor
{
-
-void SetThemeFileOutput( const std::string& name, const std::string& output )
+void SetThemeFileOutput(const std::string& name, const std::string& output)
{
{
- for(
NamedThemes::iterator iter = gThemes.begin(); iter != gThemes.end(); ++iter
)
+ for(
NamedThemes::iterator iter = gThemes.begin(); iter != gThemes.end(); ++iter
)
{
NamedTheme& theme = *iter;
{
NamedTheme& theme = *iter;
- if(
theme.name == name
)
+ if(
theme.name == name
)
{
theme.theme = output;
return;
}
}
{
theme.theme = output;
return;
}
}
- gThemes.push_back(
NamedTheme( name, output )
);
+ gThemes.push_back(
NamedTheme(name, output)
);
}
void SetDefaultFontFamily(const std::string& family)
}
void SetDefaultFontFamily(const std::string& family)
@@
-283,10
+308,10
@@
void SetDefaultFontStyle(const std::string& style)
gFontStyle = style;
}
gFontStyle = style;
}
-void SetDefaultFontSize(
float size
)
+void SetDefaultFontSize(
float size
)
{
gFontSize = size;
}
{
gFontSize = size;
}
-} // StyleMonitor
-} // Test
+} //
namespace
StyleMonitor
+} //
namespace
Test