X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fstyling%2Fstyle-manager-impl.h;h=d6bc4a12992395356e6c2d579d41724a3f6090e6;hp=0eec8917250cb9457ec7977dd8530180fad47abc;hb=e92dc54dd0580f27586bcaf04bf9fa2a6ae798dc;hpb=d43575da616e1370372b1331f47dce36dc4ac145 diff --git a/dali-toolkit/internal/styling/style-manager-impl.h b/dali-toolkit/internal/styling/style-manager-impl.h index 0eec891..d6bc4a1 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.h +++ b/dali-toolkit/internal/styling/style-manager-impl.h @@ -27,8 +27,9 @@ #include // INTERNAL INCLUDES -#include +#include #include +#include namespace Dali { @@ -68,29 +69,19 @@ protected: public: // Public API /** - * @copydoc Toolkit::StyleManager::SetOrientationValue + * @copydoc Toolkit::StyleManager::ApplyTheme */ - void SetOrientationValue( int orientation ); + void ApplyTheme( const std::string& themeFile ); /** - * @copydoc Toolkit::StyleManager::GetOrientationValue + * @copydoc Toolkit::StyleManager::ApplyDefaultTheme */ - int GetOrientationValue(); - - /** - * @copydoc Toolkit::StyleManager::SetOrientation( Orientation orientation ) - */ - void SetOrientation( Orientation orientation ); - - /** - * @copydoc Toolkit::StyleManager::GetOrientation - */ - Orientation GetOrientation(); + void ApplyDefaultTheme(); /** * @copydoc Toolkit::StyleManager::GetDefaultFontFamily */ - std::string GetDefaultFontFamily() const; + const std::string& GetDefaultFontFamily() const; /** * @copydoc Toolkit::StyleManager::SetStyleConstant @@ -103,14 +94,9 @@ public: // Public API bool GetStyleConstant( const std::string& key, Property::Value& valueOut ); /** - * @copydoc Toolkit::StyleManager::RequestThemeChange - */ - void RequestThemeChange( const std::string& themeFile ); - - /** - * @copydoc Toolkit::StyleManager::RequestDefaultTheme + * @copydoc Toolkit::StyleManager::GetConfigurations */ - void RequestDefaultTheme(); + const Property::Map GetConfigurations(); /** * @brief Apply the theme style to a control. @@ -131,21 +117,37 @@ public: // Public API */ void ApplyStyle( Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName ); + /** + * Get the state/style information for the given control + * @param[in] control The control to get state information for + * @return The style information (or empty ptr if not found) + */ + const StylePtr GetRecordedStyle( Toolkit::Control control ); + public: // SIGNALS /** * @copydoc Toolkit::StyleManager::StyleChangeSignal + * This signal is sent after all the controls have been updated + * due to style change */ - Toolkit::StyleManager::StyleChangeSignalType& StyleChangeSignal(); + Toolkit::StyleManager::StyleChangedSignalType& StyleChangedSignal(); + + /** + * This signal is sent to the controls following a style change. + * It should not be exposed in the public API + */ + Toolkit::StyleManager::StyleChangedSignalType& ControlStyleChangeSignal(); private: typedef std::vector StringList; /** * @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. @@ -175,24 +177,6 @@ private: bool LoadJSON( Toolkit::Builder builder, const std::string& jsonFileName ); /** - * @brief Collect qualifiers (e.g. Landscape, portrait etc) for a given style - * - * @param[in,out] qualifiersOut The list to populate with qualifiers - */ - void CollectQualifiers( StringList& qualifiersOut ); - - /** - * @brief Construct a qualified style name out of qualifiers - * - * A qualifed style name will be in the format: style-qualifier0-qualifier1-qualifierN - * - * @param[in] styleName The root name of the style - * @param[in] qualifiers List of qualifier names - * @param[out] qualifiedStyleOut The qualified style name - */ - void BuildQualifiedStyleName( const std::string& styleName, const StringList& qualifiers, std::string& qualifiedStyleOut ); - - /** * @brief Apply a style to the control using the given builder * * @param[in] builder The builder to apply the style from @@ -201,13 +185,6 @@ private: void ApplyStyle( Toolkit::Builder builder, Toolkit::Control control ); /** - * @brief Callback for orientation changes - * - * @param[in] orientation The orientation object - */ - void OnOrientationChanged( Orientation orientation ); - - /** * Search for a builder in the cache * * @param[in] key The key the builder was cached under @@ -231,6 +208,12 @@ private: */ void StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::Type styleChange ); + /** + * Emit signals to controls first, app second + */ + void EmitStyleChangeSignals( StyleChange::Type styleChange ); + + // Undefined StyleManager(const StyleManager&); @@ -244,13 +227,8 @@ private: 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 - int mDefaultFontSize; ///< Logical size, not a point-size - std::string mDefaultFontFamily; - std::string mThemeFile; ///< The full path of the current theme file Property::Map mThemeBuilderConstants; ///< Contants to give the theme builder @@ -261,7 +239,8 @@ private: Toolkit::Internal::FeedbackStyle* mFeedbackStyle; ///< Feedback style // Signals - Toolkit::StyleManager::StyleChangeSignalType mStyleChangeSignal; ///< Emitted when the style( theme/font ) changes + Toolkit::StyleManager::StyleChangedSignalType mControlStyleChangeSignal; ///< Emitted when the style( theme/font ) changes for the controls to style themselves + Toolkit::StyleManager::StyleChangedSignalType mStyleChangedSignal; ///< Emitted after the controls have been styled }; } // namespace Internal