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
Prevented json array of numbers appending on merge
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
styling
/
style-manager-impl.h
diff --git
a/dali-toolkit/internal/styling/style-manager-impl.h
b/dali-toolkit/internal/styling/style-manager-impl.h
index
0eec891
..
294e601
100644
(file)
--- a/
dali-toolkit/internal/styling/style-manager-impl.h
+++ b/
dali-toolkit/internal/styling/style-manager-impl.h
@@
-144,8
+144,9
@@
private:
/**
* @brief Set the current theme. Called only once per event processing cycle.
/**
* @brief Set the current theme. Called only once per event processing cycle.
+ * @param[in] themeFile The name of the theme file to read.
*/
*/
- void SetTheme();
+ void SetTheme(
const std::string& themeFile
);
/**
* @brief Internal helper method to read a file from file system.
/**
* @brief Internal helper method to read a file from file system.
@@
-248,9
+249,7
@@
private:
int mOrientationDegrees; ///< Directly set value of orientation
int mDefaultFontSize; ///< Logical size, not a point-size
int mOrientationDegrees; ///< Directly set value of orientation
int mDefaultFontSize; ///< Logical size, not a point-size
-
std::string mDefaultFontFamily;
std::string mDefaultFontFamily;
-
std::string mThemeFile; ///< The full path of the current theme file
Property::Map mThemeBuilderConstants; ///< Contants to give the theme builder
std::string mThemeFile; ///< The full path of the current theme file
Property::Map mThemeBuilderConstants; ///< Contants to give the theme builder