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 branch devel/master(1.0.49) into tizen
[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
648c11d
..
86c6d4c
100644
(file)
--- a/
dali-toolkit/internal/styling/style-manager-impl.h
+++ b/
dali-toolkit/internal/styling/style-manager-impl.h
@@
-19,16
+19,16
@@
// EXTERNAL INCLUDES
#include <string>
// EXTERNAL INCLUDES
#include <string>
-#include <
list
>
-#include <dali/
public-api/adaptor-framework/style-monito
r.h>
-#include <dali/
public-api/common/map-wrappe
r.h>
+#include <
dali/public-api/common/vector-wrapper.h
>
+#include <dali/
devel-api/common/map-wrappe
r.h>
+#include <dali/
devel-api/adaptor-framework/style-monito
r.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/object/property-map.h>
#include <dali/public-api/signals/connection-tracker.h>
// INTERNAL INCLUDES
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/object/property-map.h>
#include <dali/public-api/signals/connection-tracker.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/
public
-api/styling/style-manager.h>
-#include <dali-toolkit/
public
-api/builder/builder.h>
+#include <dali-toolkit/
devel
-api/styling/style-manager.h>
+#include <dali-toolkit/
devel
-api/builder/builder.h>
namespace Dali
{
namespace Dali
{
@@
-38,6
+38,9
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+
+class FeedbackStyle;
+
/**
* @copydoc Toolkit::StyleManager
*/
/**
* @copydoc Toolkit::StyleManager
*/
@@
-111,6
+114,13
@@
public:
void ApplyThemeStyle( Toolkit::Control control );
/**
void ApplyThemeStyle( Toolkit::Control control );
/**
+ * @brief Apply the theme style to a control at initialization.
+ *
+ * @param[in] control The control to apply style.
+ */
+ void ApplyThemeStyleAtInit( Toolkit::Control control );
+
+ /**
* @copydoc Toolkit::StyleManager::ApplyStyle
*/
void ApplyStyle( Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName );
* @copydoc Toolkit::StyleManager::ApplyStyle
*/
void ApplyStyle( Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName );
@@
-140,7
+150,7
@@
public:
private:
private:
- typedef std::
list
<std::string> StringList;
+ typedef std::
vector
<std::string> StringList;
/**
* @brief Internal helper method to read a file from file system.
/**
* @brief Internal helper method to read a file from file system.
@@
-222,9
+232,9
@@
private:
* Callback for when style monitor raises a signal
*
* @param[in] styleMonitor The style monitor object
* Callback for when style monitor raises a signal
*
* @param[in] styleMonitor The style monitor object
- * @param[in] styleChange The style change
data
+ * @param[in] styleChange The style change
type
*/
*/
- void StyleMonitorChange( StyleMonitor styleMonitor, StyleChange styleChange );
+ void StyleMonitorChange( StyleMonitor styleMonitor, StyleChange
::Type
styleChange );
// Undefined
StyleManager(const StyleManager&);
// Undefined
StyleManager(const StyleManager&);
@@
-237,10
+247,13
@@
private:
typedef std::map< std::string, Toolkit::Builder > BuilderMap;
Toolkit::Builder mThemeBuilder; ///< Builder for all default theme properties
typedef std::map< std::string, Toolkit::Builder > BuilderMap;
Toolkit::Builder mThemeBuilder; ///< Builder for all default theme properties
+ StyleMonitor mStyleMonitor; ///< Style monitor handle
Orientation mOrientation; ///< Handle to application orientation object
int mOrientationDegrees; ///< Directly set value of orientation
Orientation mOrientation; ///< Handle to application orientation object
int mOrientationDegrees; ///< Directly set value of orientation
+ int mDefaultFontSize; ///< Logical size, not a point-size
+
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
@@
-248,6
+261,8
@@
private:
BuilderMap mBuilderCache; ///< Cache of builders keyed by JSON file name
BuilderMap mBuilderCache; ///< Cache of builders keyed by JSON file name
+ Toolkit::Internal::FeedbackStyle* mFeedbackStyle; ///< Feedback style
+
// Signals
Toolkit::StyleManager::StyleChangeSignalType mStyleChangeSignal; ///< Emitted when the style( theme/font ) changes
};
// Signals
Toolkit::StyleManager::StyleChangeSignalType mStyleChangeSignal; ///< Emitted when the style( theme/font ) changes
};