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 "DALi Version 2.0.53" into 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
a7e0b46
..
18c086f
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) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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,25
+19,24
@@
#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>
#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 Dali
-{
-const std::string Dali::StyleMonitor::DEFAULT_FONT_FAMILY("DefaultFont");
-const std::string Dali::StyleMonitor::DEFAULT_FONT_STYLE("Regular");
-const float Dali::StyleMonitor::DEFAULT_FONT_SIZE(1.0f);
-}
-
namespace
{
const char* DEFAULT_THEME=
namespace
{
const char* DEFAULT_THEME=
- "{\"styles\":{\n"
+ "{\n"
+ " \"config\":\n"
+ " {\n"
+ " \"brokenImageUrl\":\"{DALI_IMAGE_DIR}broken.png\"\n"
+ " },\n"
+ " \"styles\":\n"
+ " {\n"
" \"textlabel\":\n"
" {\n"
" \"textlabel\":\n"
" {\n"
- " \"fontStyle\":
\"Regular\"
,\n"
+ " \"fontStyle\":
{\"weight\":\"normal\"}
,\n"
" \"pointSize\":18\n"
" }\n"
" }\n"
" \"pointSize\":18\n"
" }\n"
" }\n"
@@
-57,9
+56,9
@@
typedef std::vector< NamedTheme > NamedThemes;
NamedThemes gThemes;
std::string gTheme;
NamedThemes gThemes;
std::string gTheme;
-std::string gFontFamily
= Dali::StyleMonitor::DEFAULT_FONT_FAMILY
;
-std::string gFontStyle
= Dali::StyleMonitor::DEFAULT_FONT_STYLE
;
-
float gFontSize = Dali::StyleMonitor::DEFAULT_FONT_SIZE
;
+std::string gFontFamily
("LucidaSans")
;
+std::string gFontStyle
("Regular")
;
+
int gFontSize(1)
;
}
namespace Dali
}
namespace Dali
@@
-134,7
+133,6
@@
std::string StyleMonitor::GetDefaultFontStyle() const
float StyleMonitor::GetDefaultFontSize() const
{
return gFontSize;
float StyleMonitor::GetDefaultFontSize() const
{
return gFontSize;
-
}
const std::string& StyleMonitor::GetTheme() const
}
const std::string& StyleMonitor::GetTheme() const
@@
-220,7
+218,7
@@
std::string StyleMonitor::GetDefaultFontStyle() const
return GetImplementation(*this).GetDefaultFontStyle();
}
return GetImplementation(*this).GetDefaultFontStyle();
}
-
floa
t StyleMonitor::GetDefaultFontSize() const
+
in
t StyleMonitor::GetDefaultFontSize() const
{
return GetImplementation(*this).GetDefaultFontSize();
}
{
return GetImplementation(*this).GetDefaultFontSize();
}
@@
-230,7
+228,7
@@
const std::string& StyleMonitor::GetTheme() const
return GetImplementation(*this).GetTheme();
}
return GetImplementation(*this).GetTheme();
}
-void StyleMonitor::SetTheme(
std::string
themeFilePath)
+void StyleMonitor::SetTheme(
const std::string&
themeFilePath)
{
GetImplementation(*this).SetTheme(themeFilePath);
}
{
GetImplementation(*this).SetTheme(themeFilePath);
}
@@
-240,11
+238,6
@@
StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
return GetImplementation(*this).StyleChangeSignal();
}
return GetImplementation(*this).StyleChangeSignal();
}
-void StyleMonitor::EmitStyleChangeSignal(StyleChange::Type styleChange)
-{
- GetImplementation(*this).EmitStyleChangeSignal(styleChange);
-}
-
bool StyleMonitor::LoadThemeFile( const std::string& filename, std::string& output )
{
return GetImplementation(*this).LoadThemeFile(filename, output);
bool StyleMonitor::LoadThemeFile( const std::string& filename, std::string& output )
{
return GetImplementation(*this).LoadThemeFile(filename, output);