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 "Fix UTC prevent issue" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
styling
/
style-manager.h
diff --git
a/dali-toolkit/devel-api/styling/style-manager.h
b/dali-toolkit/devel-api/styling/style-manager.h
index
a568bba
..
8c9f3b5
100644
(file)
--- a/
dali-toolkit/devel-api/styling/style-manager.h
+++ b/
dali-toolkit/devel-api/styling/style-manager.h
@@
-115,6
+115,12
@@
public:
Orientation GetOrientation();
/**
Orientation GetOrientation();
/**
+ * @brief Retrieves the default font family.
+ * @return The default font family.
+ */
+ std::string GetDefaultFontFamily() const;
+
+ /**
* @brief Make a request to set the theme JSON file to one that exists in the Toolkit package.
*
* Multiple requests per event processing cycle can be made, but only the final one will be acted
* @brief Make a request to set the theme JSON file to one that exists in the Toolkit package.
*
* Multiple requests per event processing cycle can be made, but only the final one will be acted
@@
-132,7
+138,7
@@
public:
/**
* @brief Set a constant for use when building styles
*
/**
* @brief Set a constant for use when building styles
*
- * A constant is used in JSON files e.g. "my
-i
mage":"{ROOT_PATH}/mypath/image.jpg"
+ * A constant is used in JSON files e.g. "my
I
mage":"{ROOT_PATH}/mypath/image.jpg"
* where the string "{ROOT_PATH}" is substituted with the value.
*
* @param[in] key The key of the constant
* where the string "{ROOT_PATH}" is substituted with the value.
*
* @param[in] key The key of the constant