From 8502875be5b9b959661a3df5437e9ac269ce03e3 Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Fri, 6 Jun 2014 19:57:15 +0100 Subject: [PATCH] (ChangeableColor) ColorController interface and its dummy implementation [problem] Changeable UI support [cause] N/A [solution] Support color lookup with code when receive themeChange signal, Toolkit::StyleManager will lookup and appy the new color Change-Id: Ief4a063e6366724a039eeb1487ff25d9ddeef2b0 Signed-off-by: Adeel Kazmi --- .../internal/common/color-controller-impl.cpp | 58 ++++++++ .../tizen/internal/common/color-controller-impl.h | 89 +++++++++++++ .../tizen/internal/common/events/event-handler.cpp | 26 +++- adaptors/tizen/internal/common/file.list | 1 + .../tizen/internal/common/style-monitor-impl.cpp | 11 -- adaptors/tizen/internal/mobile/file.list | 3 +- .../mobile/mobile-color-controller-impl.cpp | 146 +++++++++++++++++++++ adaptors/tizen/internal/tv/file.list | 3 +- .../tizen/internal/tv/tv-color-controller-impl.cpp | 58 ++++++++ .../adaptor-framework/common/color-controller.cpp | 60 +++++++++ .../adaptor-framework/common/color-controller.h | 105 +++++++++++++++ adaptors/tizen/public-api/dali.h | 1 + adaptors/tizen/public-api/file.list | 2 + build/tizen/common/Makefile.am | 2 + build/tizen/configure.ac | 1 + 15 files changed, 548 insertions(+), 18 deletions(-) create mode 100644 adaptors/tizen/internal/common/color-controller-impl.cpp create mode 100644 adaptors/tizen/internal/common/color-controller-impl.h create mode 100644 adaptors/tizen/internal/mobile/mobile-color-controller-impl.cpp create mode 100644 adaptors/tizen/internal/tv/tv-color-controller-impl.cpp create mode 100644 adaptors/tizen/public-api/adaptor-framework/common/color-controller.cpp create mode 100644 adaptors/tizen/public-api/adaptor-framework/common/color-controller.h diff --git a/adaptors/tizen/internal/common/color-controller-impl.cpp b/adaptors/tizen/internal/common/color-controller-impl.cpp new file mode 100644 index 0000000..885f06c --- /dev/null +++ b/adaptors/tizen/internal/common/color-controller-impl.cpp @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// CLASS HEADER +#include "color-controller-impl.h" + +namespace Dali +{ + +namespace Internal +{ + +namespace Adaptor +{ + +Dali::ColorController ColorController::Get() +{ + Dali::ColorController colorController; + return colorController; +} + +ColorController::ColorController() +{ +} + +ColorController::~ColorController() +{ +} + +bool RetrieveColor( const std::string& colorCode, Vector4& colorValue ) +{ + return false; +} + +bool RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor) +{ + return false; +} + +} // namespace Adaptor + +} // namespace Internal + +} // namespace Dali diff --git a/adaptors/tizen/internal/common/color-controller-impl.h b/adaptors/tizen/internal/common/color-controller-impl.h new file mode 100644 index 0000000..19724de --- /dev/null +++ b/adaptors/tizen/internal/common/color-controller-impl.h @@ -0,0 +1,89 @@ +#ifndef __DALI_INTERNAL_COLOR_CONTROLLER_H__ +#define __DALI_INTERNAL_COLOR_CONTROLLER_H__ + +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include + +namespace Dali +{ + +namespace Internal +{ + +namespace Adaptor +{ + +/** + * Implementation of ColorController + */ +class ColorController : public BaseObject +{ +public: + + /** + * Constructor. + */ + ColorController(); + + /** + * @copydoc Dali::ColorController::Get() + */ + static Dali::ColorController Get(); + + /** + * @copydoc Dali::ColorController::RetrieveColor(const std::string&, Vector4&) + */ + bool RetrieveColor( const std::string& colorCode, Vector4& colorValue ); + + /** + *copydoc Dali::ColorController::RetrieveColor(const std::string&, Vector4&, Vector4&, Vector4&) + */ + bool RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor); + +protected: + /** + * Destructor. + */ + virtual ~ColorController(); + +}; + +} // namespace Adaptor + +} // namespace Internal + +// Additional Helpers for public-api forwarding methods +inline Internal::Adaptor::ColorController& GetImplementation(Dali::ColorController& controller) +{ + DALI_ASSERT_ALWAYS(controller && "ColorController handle is empty"); + BaseObject& handle = controller.GetBaseObject(); + return static_cast(handle); +} + +inline const Internal::Adaptor::ColorController& GetImplementation(const Dali::ColorController& controller) +{ + DALI_ASSERT_ALWAYS(controller && "ColorController handle is empty"); + const BaseObject& handle = controller.GetBaseObject(); + return static_cast(handle); +} + +} // namespace Dali + +#endif // __DALI_INTERNAL_COLOR_CONTROLLER_H__ diff --git a/adaptors/tizen/internal/common/events/event-handler.cpp b/adaptors/tizen/internal/common/events/event-handler.cpp index 8e292da..fa9ddbf 100644 --- a/adaptors/tizen/internal/common/events/event-handler.cpp +++ b/adaptors/tizen/internal/common/events/event-handler.cpp @@ -22,6 +22,7 @@ #include #include #include + #include #include @@ -72,6 +73,8 @@ Integration::Log::Filter* gSelectionEventLogFilter = Integration::Log::Filter::N namespace { +const char * DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME = "db/setting/accessibility/font_name"; // It will be update at vconf-key.h and replaced. + // Currently this code is internal to dali/dali/internal/event/text/utf8.h but should be made Public and used from there instead. size_t Utf8SequenceLength(const unsigned char leadByte) { @@ -199,8 +202,6 @@ static unsigned int GetCurrentMilliSeconds(void) return (tv.tv_sec * 1000) + (tv.tv_usec / 1000); } -const char * DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE = "db/setting/accessibility/font_name"; // It will be update at vconf-key.h and replaced. - } // unnamed namespace // Impl to hide EFL implementation. @@ -255,9 +256,10 @@ struct EventHandler::Impl mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_X_EVENT_SELECTION_CLEAR, EcoreEventSelectionClear, handler ) ); mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_X_EVENT_SELECTION_NOTIFY, EcoreEventSelectionNotify, handler ) ); - // Register Vconf notify - font name and size - vconf_notify_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontNameChanged, handler ); + // Register Vconf notify - font name, font size and style + vconf_notify_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged, handler ); vconf_notify_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged, handler ); + vconf_notify_key_changed( VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, VconfNotifyThemeChanged, handler ); } } @@ -266,8 +268,9 @@ struct EventHandler::Impl */ ~Impl() { + vconf_ignore_key_changed( VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, VconfNotifyThemeChanged ); vconf_ignore_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged ); - vconf_ignore_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontNameChanged ); + vconf_ignore_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged ); for( std::vector::iterator iter = mEcoreEventHandler.begin(), endIter = mEcoreEventHandler.end(); iter != endIter; ++iter ) { @@ -1076,6 +1079,19 @@ struct EventHandler::Impl handler->SendEvent( fontChange ); } + /** + * Called when style is changed + */ + static void VconfNotifyThemeChanged( keynode_t* node, void* data ) + { + EventHandler* handler( static_cast(data) ); + + StyleChange themeChange; + themeChange.themeChange = true; + + handler->SendEvent( themeChange ); + } + // Data EventHandler* mHandler; std::vector mEcoreEventHandler; diff --git a/adaptors/tizen/internal/common/file.list b/adaptors/tizen/internal/common/file.list index f7b6fde..6e93a70 100644 --- a/adaptors/tizen/internal/common/file.list +++ b/adaptors/tizen/internal/common/file.list @@ -59,6 +59,7 @@ tizen_adaptor_internal_common_src_files = \ tizen_adaptor_internal_common_profile_src_files = \ $(tizen_adaptor_internal_src_dir)/key-impl.cpp \ $(tizen_adaptor_internal_src_dir)/system-settings.cpp \ + $(tizen_adaptor_internal_src_dir)/color-controller-impl.cpp \ \ $(tizen_adaptor_internal_src_dir)/ecore-x/ecore-x-render-surface-factory.cpp \ No newline at end of file diff --git a/adaptors/tizen/internal/common/style-monitor-impl.cpp b/adaptors/tizen/internal/common/style-monitor-impl.cpp index fb0900c..45be0c2 100644 --- a/adaptors/tizen/internal/common/style-monitor-impl.cpp +++ b/adaptors/tizen/internal/common/style-monitor-impl.cpp @@ -37,15 +37,6 @@ namespace Adaptor namespace { -void DefaultFontSizeChangeNotification(keynode_t* node, void* data) -{ - StyleMonitor* styleMonitor = static_cast(data); - - StyleChange styleChange; - styleChange.defaultFontSizeChange = true; - styleMonitor->StyleChanged(styleChange); -} - BaseHandle Create() { BaseHandle handle( StyleMonitor::Get() ); @@ -85,12 +76,10 @@ Dali::StyleMonitor StyleMonitor::Get() StyleMonitor::StyleMonitor(Integration::PlatformAbstraction& platformAbstraction) : mPlatformAbstraction(platformAbstraction) { - vconf_notify_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, DefaultFontSizeChangeNotification, this ); } StyleMonitor::~StyleMonitor() { - vconf_ignore_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, DefaultFontSizeChangeNotification ); } void StyleMonitor::StyleChanged(StyleChange styleChange) diff --git a/adaptors/tizen/internal/mobile/file.list b/adaptors/tizen/internal/mobile/file.list index 46923a8..800acdc 100644 --- a/adaptors/tizen/internal/mobile/file.list +++ b/adaptors/tizen/internal/mobile/file.list @@ -3,4 +3,5 @@ tizen_adaptor_internal_common_src_files += \ $(tizen_adaptor_internal_src_dir)/key-impl.cpp \ $(tizen_adaptor_internal_src_dir)/../mobile/mobile-render-surface-factory.cpp \ $(tizen_adaptor_internal_src_dir)/../mobile/mobile-native-buffer-render-surface.cpp \ - $(tizen_adaptor_internal_src_dir)/../mobile/mobile-system-settings.cpp + $(tizen_adaptor_internal_src_dir)/../mobile/mobile-system-settings.cpp \ + $(tizen_adaptor_internal_src_dir)/../mobile/mobile-color-controller-impl.cpp diff --git a/adaptors/tizen/internal/mobile/mobile-color-controller-impl.cpp b/adaptors/tizen/internal/mobile/mobile-color-controller-impl.cpp new file mode 100644 index 0000000..3067126 --- /dev/null +++ b/adaptors/tizen/internal/mobile/mobile-color-controller-impl.cpp @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// CLASS HEADER +#include + +// EXTERNAL INCLUDES +#include +#include +#include + +// INTERNAL INCLUDES +#include + +namespace Dali +{ + +namespace Internal +{ + +namespace Adaptor +{ + +namespace +{ + +BaseHandle Create() +{ + return ColorController::Get(); +} +Dali::TypeRegistration COLOR_CONTROLLER_TYPE( typeid(Dali::ColorController), typeid(Dali::BaseHandle), Create ); + +} + +Dali::ColorController ColorController::Get() +{ + Dali::ColorController colorController; + + if ( Adaptor::IsAvailable() ) + { + // Check whether the singleton is already created + Dali::BaseHandle handle = Dali::Adaptor::Get().GetSingleton( typeid( Dali::ColorController ) ); + if(handle) + { + // If so, downcast the handle + colorController = Dali::ColorController( dynamic_cast< ColorController* >( handle.GetObjectPtr() ) ); + } + else + { + Adaptor& adaptorImpl( Adaptor::GetImplementation( Adaptor::Get() ) ); + colorController = Dali::ColorController( new ColorController( ) ); + adaptorImpl.RegisterSingleton( typeid( colorController ), colorController ); + } + } + + return colorController; + +} + +ColorController::ColorController() +{ +} + +ColorController::~ColorController() +{ +} + +bool ColorController::RetrieveColor( const std::string& colorCode, Vector4& colorValue ) +{ + int R = 0; + int G = 0; + int B = 0; + int A = 0; + + if( ea_theme_color_get(colorCode.c_str(), &R, &G, &B, &A, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) ) + { + colorValue.r = (float) (R) / 255.0f; + colorValue.g = (float) (G) / 255.0f; + colorValue.b = (float) (B) / 255.0f; + colorValue.a = (float) (A) / 255.0f; + + return true; + } + + return false; +} + +bool ColorController::RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor) +{ + int R = 0; + int G = 0; + int B = 0; + int A = 0; + + int outlineR = 0; + int outlineG = 0; + int outlineB = 0; + int outlineA = 0; + + int shadowR = 0; + int shadowG = 0; + int shadowB = 0; + int shadowA = 0; + + if( ea_theme_color_get(colorCode.c_str(), &R, &G, &B, &A, &outlineR, &outlineG, &outlineB, &outlineA, &shadowR, &shadowG, &shadowB, &shadowA) ) + { + textColor.r = (float) (R) / 255.0f; + textColor.g = (float) (G) / 255.0f; + textColor.b = (float) (B) / 255.0f; + textColor.a = (float) (A) / 255.0f; + + textOutlineColor.r = (float) (outlineR) / 255.0f; + textOutlineColor.g = (float) (outlineG) / 255.0f; + textOutlineColor.b = (float) (outlineB) / 255.0f; + textOutlineColor.a = (float) (outlineA) / 255.0f; + + textShadowColor.r = (float) (shadowR) / 255.0f; + textShadowColor.g = (float) (shadowG) / 255.0f; + textShadowColor.b = (float) (shadowB) / 255.0f; + textShadowColor.a = (float) (shadowA) / 255.0f; + + return true; + } + + return false; +} + +} // namespace Adaptor + +} // namespace Internal + +} // namespace Dali diff --git a/adaptors/tizen/internal/tv/file.list b/adaptors/tizen/internal/tv/file.list index 9da4856..6bde20f 100644 --- a/adaptors/tizen/internal/tv/file.list +++ b/adaptors/tizen/internal/tv/file.list @@ -2,4 +2,5 @@ tizen_adaptor_internal_common_src_files += \ $(tizen_adaptor_internal_src_dir)/../tv/tv-key-impl.cpp \ $(tizen_adaptor_internal_src_dir)/../tv/tv-render-surface-factory.cpp \ - $(tizen_adaptor_internal_src_dir)/../tv/tv-system-settings.cpp + $(tizen_adaptor_internal_src_dir)/../tv/tv-system-settings.cpp \ + $(tizen_adaptor_internal_src_dir)/../tv/tv-color-controller-impl.cpp diff --git a/adaptors/tizen/internal/tv/tv-color-controller-impl.cpp b/adaptors/tizen/internal/tv/tv-color-controller-impl.cpp new file mode 100644 index 0000000..71607c4 --- /dev/null +++ b/adaptors/tizen/internal/tv/tv-color-controller-impl.cpp @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// CLASS HEADER +#include + +namespace Dali +{ + +namespace Internal +{ + +namespace Adaptor +{ + +Dali::ColorController ColorController::Get() +{ + Dali::ColorController colorController; + return colorController; +} + +ColorController::ColorController() +{ +} + +ColorController::~ColorController() +{ +} + +bool RetrieveColor( const std::string& colorCode, Vector4& colorValue ) +{ + return false; +} + +bool RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor) +{ + return false; +} + +} // namespace Adaptor + +} // namespace Internal + +} // namespace Dali diff --git a/adaptors/tizen/public-api/adaptor-framework/common/color-controller.cpp b/adaptors/tizen/public-api/adaptor-framework/common/color-controller.cpp new file mode 100644 index 0000000..c95e7c4 --- /dev/null +++ b/adaptors/tizen/public-api/adaptor-framework/common/color-controller.cpp @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// CLASS HEADER +#include + +// INTERNAL INCLUDES +#include + +namespace Dali +{ + +ColorController::ColorController() +{ +} + +ColorController::ColorController(const ColorController& controller) +: BaseHandle(controller) +{ +} + +ColorController ColorController::Get() +{ + return Internal::Adaptor::ColorController::Get(); +} + +ColorController::~ColorController() +{ +} + +bool ColorController::RetrieveColor( const std::string& colorCode, Vector4& colorValue ) +{ + return GetImplementation(*this).RetrieveColor( colorCode, colorValue ); +} + +bool ColorController::RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor) +{ + return GetImplementation(*this).RetrieveColor( colorCode, textColor, textOutlineColor, textShadowColor ); +} + +ColorController::ColorController(Internal::Adaptor::ColorController* internal) +: BaseHandle(internal) +{ +} + +} diff --git a/adaptors/tizen/public-api/adaptor-framework/common/color-controller.h b/adaptors/tizen/public-api/adaptor-framework/common/color-controller.h new file mode 100644 index 0000000..52334eb --- /dev/null +++ b/adaptors/tizen/public-api/adaptor-framework/common/color-controller.h @@ -0,0 +1,105 @@ +#ifndef __DALI_COLOR_CONTROLLER_H__ +#define __DALI_COLOR_CONTROLLER_H__ + +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include + +namespace Dali DALI_IMPORT_API +{ + +namespace Internal DALI_INTERNAL +{ +namespace Adaptor +{ +class ColorController; +} +} + +/** + * Color controller currently caches the changeable color table which updates with the theme change + * + * It provides the functionality of retrieving a RGBA color by passing in the color code string. + */ +class ColorController : public BaseHandle +{ +public: + + /** + * @brief Create an uninitialized ColorController handle. + */ + ColorController(); + + /** + * @brief Creates a copy of the handle. + * + * The copy will point to the same implementation as the original. + * @param[in] colorController The Color Controller to copy from. + */ + ColorController( const ColorController& colorController); + + /** + * @copydoc Dali::BaseHandle::operator= + */ + using BaseHandle::operator=; + + /** + * @brief Retrieve the initialized instance of the ColorController. + * + * @return Handle to ColorController. + */ + static ColorController Get(); + + /** + * @brief Destructor. + */ + virtual ~ColorController(); + + /** + * @brief Retrieve the RGB value by given the color code. + * + * @param[in] colorCode The color code string. + * @param[out] colorValue The RGBA color + * @return true if the color code exists, otherwise false + */ + bool RetrieveColor( const std::string& colorCode, Vector4& colorValue ); + + /** + * @brief Retrieve the RGB values by given the color code. + * + * @param[in] colorCode The color code string. + * @param[out] textColor The text color. + * @param[out] textOutlineColor The text outline color. + * @param[out] textShadowColor The text shadow color. + * @return true if the color code exists, otherwise false + */ + bool RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor); + + +public: // Not intended for application developers + /** + * @brief This constructor is used internally to create a handle from an object pointer. + * @param [in] colorController A pointer the internal color controller. + */ + explicit DALI_INTERNAL ColorController(Internal::Adaptor::ColorController* colorController); +}; + + +} //namespace Dali + +#endif /* __DALI_COLOR_CONTROLLER_H__ */ diff --git a/adaptors/tizen/public-api/dali.h b/adaptors/tizen/public-api/dali.h index 278a289..2808a1f 100644 --- a/adaptors/tizen/public-api/dali.h +++ b/adaptors/tizen/public-api/dali.h @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/adaptors/tizen/public-api/file.list b/adaptors/tizen/public-api/file.list index ef721c0..581568f 100644 --- a/adaptors/tizen/public-api/file.list +++ b/adaptors/tizen/public-api/file.list @@ -5,6 +5,7 @@ tizen_adaptor_public_api_src_files = \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/adaptor.cpp \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/clipboard.cpp \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/clipboard-event-notifier.cpp \ + $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/color-controller.cpp \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/device-layout.cpp \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/drag-and-drop-detector.cpp \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/event-feeder.cpp \ @@ -26,6 +27,7 @@ tizen_adaptor_public_api_src_files = \ tizen_adaptor_public_api_common_header_files = \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/accessibility-action-handler.h \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/accessibility-gesture-handler.h \ + $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/color-controller.h \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/event-feeder.h \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/feedback-plugin.h \ $(tizen_adaptor_public_api_src_dir)/adaptor-framework/common/physical-keyboard.h \ diff --git a/build/tizen/common/Makefile.am b/build/tizen/common/Makefile.am index c6a0b8e..d1b535a 100644 --- a/build/tizen/common/Makefile.am +++ b/build/tizen/common/Makefile.am @@ -152,10 +152,12 @@ libdali_adaptor_common_la_LIBADD = \ if MOBILE_PROFILE libdali_adaptor_common_la_CXXFLAGS += $(ASSIMP_CFLAGS) \ $(DEVICED_CFLAGS) \ + $(EFL_ASSIST_CFLAGS) \ $(NATIVE_BUFFER_CFLAGS) \ $(NATIVE_BUFFER_POOL_CFLAGS) libdali_adaptor_common_la_LIBADD += $(ASSIMP_LIBS) \ + $(EFL_ASSIST_LIBS) \ $(NATIVE_BUFFER_LIBS) \ $(NATIVE_BUFFER_POOL_LIBS) endif diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index 58ad053..466594f 100644 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -52,6 +52,7 @@ PKG_CHECK_MODULES(XML, libxml-2.0) PKG_CHECK_MODULES(LIBDRM, libdrm) PKG_CHECK_MODULES(LIBEXIF, libexif) PKG_CHECK_MODULES(CAPI_SYSTEM_SYSTEM_SETTINGS, capi-system-system-settings) +PKG_CHECK_MODULES(EFL_ASSIST, efl-assist) # Check for availability of BulletPhysics PKG_CHECK_EXISTS(bullet, [ -- 2.7.4