From 73d239b4c5c2c4a558cbaf44bdcc744c8f497c14 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Fri, 22 May 2015 17:08:47 +0100 Subject: [PATCH] Changes after converting StyleChange to an enum Change-Id: Ibfcb33744bf8dc9b6cc7dbcf0bc5097e6ae25f8a --- .../dali-toolkit-test-utils/dummy-control.cpp | 6 +++- .../dali-toolkit-test-utils/dummy-control.h | 2 +- .../toolkit-style-monitor.cpp | 9 ++--- .../toolkit-style-monitor.h | 4 +-- build/tizen/plugins/Makefile.am | 1 + dali-toolkit/devel-api/styling/style-manager.h | 2 +- .../controls/text-controls/text-field-impl.cpp | 2 +- .../controls/text-controls/text-field-impl.h | 2 +- .../controls/text-controls/text-label-impl.cpp | 2 +- .../controls/text-controls/text-label-impl.h | 2 +- .../internal/styling/style-manager-impl.cpp | 39 +++++++++++++--------- dali-toolkit/internal/styling/style-manager-impl.h | 4 +-- dali-toolkit/public-api/controls/control-impl.cpp | 4 +-- dali-toolkit/public-api/controls/control-impl.h | 2 +- 14 files changed, 46 insertions(+), 35 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp index d1d4468..0d9059d 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp @@ -110,7 +110,11 @@ DummyControlImplOverride::~DummyControlImplOverride() { } void DummyControlImplOverride::OnInitialize() { initializeCalled = true; } -void DummyControlImplOverride::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ) { themeChangeCalled = change.themeChange; fontChangeCalled = change.defaultFontSizeChange; } +void DummyControlImplOverride::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) +{ + themeChangeCalled = change == StyleChange::THEME_CHANGE; + fontChangeCalled = change == StyleChange::DEFAULT_FONT_SIZE_CHANGE; +} void DummyControlImplOverride::OnPinch(const PinchGesture& pinch) { pinchCalled = true; } void DummyControlImplOverride::OnPan(const PanGesture& pan) { panCalled = true; } void DummyControlImplOverride::OnTap(const TapGesture& tap) { tapCalled = true; } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h index 473a01d..19dc1fe 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h @@ -102,7 +102,7 @@ private: private: // From Internal::Control virtual void OnInitialize(); - virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ); + virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); virtual void OnPinch(const PinchGesture& pinch); virtual void OnPan(const PanGesture& pan); virtual void OnTap(const TapGesture& tap); 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 dc2d39f..65750c1 100644 --- 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 @@ -48,7 +48,7 @@ public: // Style Information public: // Signals Dali::StyleMonitor::StyleChangeSignalType& StyleChangeSignal(); - void EmitStyleChangeSignal(StyleChange styleChange) + void EmitStyleChangeSignal(StyleChange::Type styleChange) { mStyleChangeSignal.Emit(Dali::StyleMonitor(this), styleChange); } @@ -96,11 +96,8 @@ const std::string& StyleMonitor::GetTheme() const void StyleMonitor::SetTheme(std::string path) { - StyleChange styleChange; - styleChange.themeChange = true; - styleChange.themeFilePath = path; mTheme = path; - EmitStyleChangeSignal(styleChange); + EmitStyleChangeSignal( StyleChange::THEME_CHANGE ); } Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal() @@ -170,7 +167,7 @@ StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal() return GetImplementation(*this).StyleChangeSignal(); } -void StyleMonitor::EmitStyleChangeSignal(StyleChange styleChange) +void StyleMonitor::EmitStyleChangeSignal(StyleChange::Type styleChange) { GetImplementation(*this).EmitStyleChangeSignal(styleChange); } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h index fc8b8f2..8aa55e5 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h @@ -41,7 +41,7 @@ class StyleMonitor; class StyleMonitor : public BaseHandle { public: // Typedefs - typedef Signal< void (StyleMonitor, StyleChange) > StyleChangeSignalType; + typedef Signal< void (StyleMonitor, StyleChange::Type) > StyleChangeSignalType; static const std::string DEFAULT_FONT_FAMILY; static const float DEFAULT_FONT_SIZE; @@ -60,7 +60,7 @@ public: // Style Information public: // Signals StyleChangeSignalType& StyleChangeSignal(); - void EmitStyleChangeSignal(StyleChange handle); + void EmitStyleChangeSignal(StyleChange::Type handle); public: // Operators StyleMonitor& operator=(const StyleMonitor& monitor); diff --git a/build/tizen/plugins/Makefile.am b/build/tizen/plugins/Makefile.am index 557c8c2..9d0b25b 100644 --- a/build/tizen/plugins/Makefile.am +++ b/build/tizen/plugins/Makefile.am @@ -39,6 +39,7 @@ libdali_script_plugin_v8_la_SOURCES = \ libdali_script_plugin_v8_la_DEPENDENCIES = libdali_script_plugin_v8_la_CXXFLAGS = -DDALI_COMPILATION \ + -I../../../ \ $(V8_CFLAGS) \ $(DALI_TOOLKIT_CFLAGS) \ $(DALICORE_CFLAGS) \ diff --git a/dali-toolkit/devel-api/styling/style-manager.h b/dali-toolkit/devel-api/styling/style-manager.h index f3b8b7a..b90c1fd 100644 --- a/dali-toolkit/devel-api/styling/style-manager.h +++ b/dali-toolkit/devel-api/styling/style-manager.h @@ -64,7 +64,7 @@ class DALI_IMPORT_API StyleManager : public BaseHandle public: // Signals - typedef Signal< void ( StyleManager, StyleChange ) > StyleChangeSignalType; + typedef Signal< void ( StyleManager, StyleChange::Type ) > StyleChangeSignalType; /** * @brief Create a StyleManager handle; this can be initialised with StyleManager::Get() diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index dc9545a..f272a26 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -838,7 +838,7 @@ void TextField::OnInitialize() self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); } -void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ) +void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h index 5292178..6e9525d 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h @@ -97,7 +97,7 @@ private: // From Control /** * @copydoc Control::OnStyleChange() */ - virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ); + virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); /** * @copydoc Control::GetNaturalSize() diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index 5c6fd53..423a8ae 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -432,7 +432,7 @@ void TextLabel::OnInitialize() engine.SetTextEllipsisEnabled( true ); } -void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ) +void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.h b/dali-toolkit/internal/controls/text-controls/text-label-impl.h index 54c2554..3e0fd35 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h @@ -75,7 +75,7 @@ private: // From Control /** * @copydoc Control::OnStyleChange() */ - virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ); + virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); /** * @copydoc Control::OnRelayout() diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp index 69eee7b..814421e 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.cpp +++ b/dali-toolkit/internal/styling/style-manager-impl.cpp @@ -358,9 +358,7 @@ void StyleManager::SetTheme() mThemeBuilder = CreateBuilder( mThemeBuilderConstants ); if ( LoadJSON( mThemeBuilder, mThemeFile ) ) { - StyleChange change; - change.themeChange = true; - mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), change ); + mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), StyleChange::THEME_CHANGE ); } else { @@ -384,25 +382,36 @@ void StyleManager::CacheBuilder( Toolkit::Builder builder, const std::string& ke mBuilderCache[ key ] = builder; } -void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange styleChange ) +void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::Type styleChange ) { - if( styleChange.defaultFontSizeChange ) + switch ( styleChange ) { - mDefaultFontSize = styleMonitor.GetDefaultFontSize(); - } - - if( styleChange.themeChange ) - { - if( ! styleChange.themeFilePath.empty() ) + case StyleChange::DEFAULT_FONT_CHANGE: { - mThemeFile = styleChange.themeFilePath; + break; } - else + + case StyleChange::DEFAULT_FONT_SIZE_CHANGE: { - mThemeFile = DEFAULT_THEME; + mDefaultFontSize = styleMonitor.GetDefaultFontSize(); + break; } - SetTheme(); + case StyleChange::THEME_CHANGE: + { + const std::string& newTheme = styleMonitor.GetTheme(); + if( ! newTheme.empty() ) + { + mThemeFile = newTheme; + } + else + { + mThemeFile = DEFAULT_THEME; + } + + SetTheme(); + break; + } } mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange ); diff --git a/dali-toolkit/internal/styling/style-manager-impl.h b/dali-toolkit/internal/styling/style-manager-impl.h index 154aec8..c612f7d 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.h +++ b/dali-toolkit/internal/styling/style-manager-impl.h @@ -222,9 +222,9 @@ private: * 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&); diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 11347da..cd4301d 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -843,10 +843,10 @@ void Control::OnActivated() { } -void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ) +void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) { // By default the control is only interested in theme (not font) changes - if( change.themeChange ) + if( change == StyleChange::THEME_CHANGE ) { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 5363c25..68a9c4b 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -416,7 +416,7 @@ private: * @param[in] styleManager The StyleManager object. * @param[in] change Information denoting what has changed. */ - virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ); + virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); /** * @brief Called whenever a pinch gesture is detected on this control. -- 2.7.4