From: adun Date: Thu, 21 Jun 2018 06:52:36 +0000 (+0800) Subject: Modify codes for Dali Windows backend X-Git-Tag: dali_1.3.44~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=fb791c98c1c80ad07a935975c1b9332fada628f8;hp=56523221b58038d0a88e415eb5a163a983d2b63c Modify codes for Dali Windows backend Change-Id: I048474ba77af14b291c859b2a19451e377d2e05b --- diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h index 692e0d8..f2bc15a 100755 --- a/dali-toolkit/internal/builder/builder-impl.h +++ b/dali-toolkit/internal/builder/builder-impl.h @@ -37,16 +37,16 @@ #include // Warning messages usually displayed -#define DALI_SCRIPT_WARNING(format, args...) \ - DALI_LOG_WARNING("Script:" format, ## args) +#define DALI_SCRIPT_WARNING(format, ...) \ + DALI_LOG_WARNING("Script:" format, ## __VA_ARGS__) // Info messages are usually debug build -#define DALI_SCRIPT_INFO(format, args...) \ - DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## args) +#define DALI_SCRIPT_INFO(format, ...) \ + DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## __VA_ARGS__) // Info Verbose need to be swiched on in gFilterScript filter constructor (by default set to General) -#define DALI_SCRIPT_VERBOSE(format, args...) \ - DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## args) +#define DALI_SCRIPT_VERBOSE(format, ...) \ + DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## __VA_ARGS__) namespace Dali { diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp old mode 100644 new mode 100755 index 55809bd..9138e9b --- a/dali-toolkit/internal/builder/builder-signals.cpp +++ b/dali-toolkit/internal/builder/builder-signals.cpp @@ -35,7 +35,7 @@ namespace Toolkit namespace Internal { extern Animation CreateAnimation( const TreeNode& child, Dali::Toolkit::Internal::Builder* const builder ); -extern bool DeterminePropertyFromNode( const TreeNode& node, Property::Value& value ); +extern void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value ); } } } diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h index 1bb4d2a..3f8444f 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h @@ -634,7 +634,7 @@ private: float mScrollSpeed; float mScrollOvershoot; - Dali::Gesture::State mGestureState : 3; + Dali::Gesture::State mGestureState : 4; bool mAnimatingOvershootOn : 1; ///< Whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off) bool mAnimateOvershootOff : 1; ///< Whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off) bool mAnchoringEnabled : 1; diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp old mode 100644 new mode 100755 index 163c248..bb83e7d --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -41,9 +41,9 @@ //#define ENABLED_SCROLL_STATE_LOGGING #ifdef ENABLED_SCROLL_STATE_LOGGING -#define DALI_LOG_SCROLL_STATE(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ## args) +#define DALI_LOG_SCROLL_STATE(format, ...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ## __VA_ARGS__) #else -#define DALI_LOG_SCROLL_STATE(format, args...) +#define DALI_LOG_SCROLL_STATE(format, ...) #endif // TODO: Change to two class system: diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h old mode 100644 new mode 100755 index b5fbb2e..dcd48ce --- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h +++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h @@ -264,7 +264,7 @@ private: Dali::WrapMode::Type mWrapModeU:3; Dali::WrapMode::Type mWrapModeV:3; - DevelAnimatedImageVisual::Action::Type mActionStatus:2; + DevelAnimatedImageVisual::Action::Type mActionStatus:3; bool mStartFirstFrame:1; }; diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.h b/dali-toolkit/internal/visuals/texture-manager-impl.h old mode 100644 new mode 100755 index 59d191e..6df17c6 --- a/dali-toolkit/internal/visuals/texture-manager-impl.h +++ b/dali-toolkit/internal/visuals/texture-manager-impl.h @@ -482,12 +482,12 @@ private: TextureManager::TextureHash hash; ///< The hash used to cache this Texture float scaleFactor; ///< The scale factor to apply to the Texture when masking int16_t referenceCount; ///< The reference count of clients using this Texture - LoadState loadState:3; ///< The load state showing the load progress of the Texture + LoadState loadState:4; ///< The load state showing the load progress of the Texture FittingMode::Type fittingMode:2; ///< The requested FittingMode Dali::SamplingMode::Type samplingMode:3; ///< The requested SamplingMode - StorageType storageType:1; ///< CPU storage / GPU upload; + StorageType storageType:2; ///< CPU storage / GPU upload; bool loadSynchronously:1; ///< True if synchronous loading was requested - UseAtlas useAtlas:1; ///< USE_ATLAS if an atlas was requested. + UseAtlas useAtlas:2; ///< USE_ATLAS if an atlas was requested. ///< This is updated to false if atlas is not used bool cropToMask:1; ///< true if the image should be cropped to the mask size. bool orientationCorrection:1; ///< true if the image should be rotated to match exif orientation data diff --git a/dali-toolkit/public-api/dali-toolkit-common.h b/dali-toolkit/public-api/dali-toolkit-common.h index 56f3927..d16ef81 100755 --- a/dali-toolkit/public-api/dali-toolkit-common.h +++ b/dali-toolkit/public-api/dali-toolkit-common.h @@ -38,8 +38,18 @@ # define DALI_TOOLKIT_API __attribute__ ((visibility ("default"))) # endif #else +#ifdef WIN32 +#ifdef BUILDING_DALI_TOOLKIT +/** Visibility attribute to hide declarations */ +# define DALI_TOOLKIT_API __declspec(dllexport) +#else +/** Visibility attribute to hide declarations */ +# define DALI_TOOLKIT_API __declspec(dllimport) +#endif +#else /** Visibility attribute to show declarations */ # define DALI_TOOLKIT_API #endif +#endif #endif // DALI_TOOLKIT_COMMON_H