auto childMargin = childLayout->GetMargin();
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::OnMeasure child width[%d] height(%d)\n", childWidth.mValue, childHeight.mValue );
- layoutWidth = std::max( layoutWidth, childWidth + LayoutLength( childMargin.start ) + LayoutLength( childMargin.end ) );
- layoutHeight = std::max( layoutHeight, childHeight + LayoutLength( childMargin.top ) + LayoutLength( childMargin.bottom ) );
+ layoutWidth = std::max( layoutWidth, childWidth + childMargin.start + childMargin.end );
+ layoutHeight = std::max( layoutHeight, childHeight + childMargin.top + childMargin.bottom );
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::OnMeasure calculated child width[%d] calculated height(%d)\n", layoutWidth.mValue, layoutHeight.mValue );
}
else
#include <dali-toolkit/internal/builder/style.h>
// Warning messages usually displayed
-#define DALI_SCRIPT_WARNING(format, ...) \
- DALI_LOG_WARNING("Script:" format, ## __VA_ARGS__)
+#define DALI_SCRIPT_WARNING(format, args...) \
+ DALI_LOG_WARNING("Script:" format, ## args)
// Info messages are usually debug build
-#define DALI_SCRIPT_INFO(format, ...) \
- DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## __VA_ARGS__)
+#define DALI_SCRIPT_INFO(format, args...) \
+ DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## args)
// Info Verbose need to be swiched on in gFilterScript filter constructor (by default set to General)
-#define DALI_SCRIPT_VERBOSE(format, ...) \
- DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## __VA_ARGS__)
+#define DALI_SCRIPT_VERBOSE(format, args...) \
+ DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## args)
namespace Dali
{
namespace Internal
{
extern Animation CreateAnimation( const TreeNode& child, Dali::Toolkit::Internal::Builder* const builder );
-extern void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value );
+extern bool DeterminePropertyFromNode( const TreeNode& node, Property::Value& value );
}
}
}
float mScrollSpeed;
float mScrollOvershoot;
- Dali::Gesture::State mGestureState : 4;
+ Dali::Gesture::State mGestureState : 3;
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;
//#define ENABLED_SCROLL_STATE_LOGGING
#ifdef ENABLED_SCROLL_STATE_LOGGING
-#define DALI_LOG_SCROLL_STATE(format, ...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ## __VA_ARGS__)
+#define DALI_LOG_SCROLL_STATE(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, "%s:%d " format "\n", __PRETTY_FUNCTION__, __LINE__, ## args)
#else
-#define DALI_LOG_SCROLL_STATE(format, ...)
+#define DALI_LOG_SCROLL_STATE(format, args...)
#endif
// TODO: Change to two class system:
// Remove padding here since Yoga doesn't consider it as a part of the node size
Extents padding = childLayout->GetPadding();
- auto measuredWidth = childLayout->GetMeasuredWidth() - LayoutLength( padding.end ) - LayoutLength( padding.start );
- auto measuredHeight = childLayout->GetMeasuredHeight() - LayoutLength( padding.bottom ) - LayoutLength( padding.top );
+ auto measuredWidth = childLayout->GetMeasuredWidth() - padding.end - padding.start;
+ auto measuredHeight = childLayout->GetMeasuredHeight() - padding.bottom - padding.top;
return YGSize{
.width = measuredWidth,
auto height = bottom - top;
// Space available for child
- auto childSpace = height - LayoutLength( padding.top ) - LayoutLength( padding.bottom );
+ auto childSpace = height - padding.top - padding.bottom;
auto count = GetChildCount();
{
case Dali::Toolkit::LinearLayout::Alignment::TOP:
{
- childTop = LayoutLength( padding.top ) + LayoutLength( childMargin.top );
+ childTop = LayoutLength( padding.top ) + childMargin.top;
break;
}
case Dali::Toolkit::LinearLayout::Alignment::BOTTOM:
{
- childTop = height - LayoutLength( padding.bottom ) - childHeight - LayoutLength( childMargin.bottom );
+ childTop = height - padding.bottom - childHeight - childMargin.bottom;
break;
}
case Dali::Toolkit::LinearLayout::Alignment::CENTER_VERTICAL:
default:
{
- childTop = LayoutLength( padding.top ) + ( ( childSpace - childHeight ) / 2 ) + LayoutLength( childMargin.top ) - LayoutLength( childMargin.bottom );
+ childTop = LayoutLength( padding.top ) + ( ( childSpace - childHeight ) / 2 ) + childMargin.top - childMargin.bottom;
break;
}
}
childLeft += childMargin.start;
childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
- childLeft += childWidth + LayoutLength( childMargin.end ) + mCellPadding.width;
+ childLeft += childWidth + childMargin.end + mCellPadding.width;
}
}
}
if( isExactly && useExcessSpace )
{
LayoutLength totalLength = mTotalLength;
- mTotalLength = std::max( totalLength, totalLength + LayoutLength( childMargin.top ) + LayoutLength( childMargin.bottom ) );
+ mTotalLength = std::max( totalLength, totalLength + childMargin.top + childMargin.bottom );
}
else
{
auto width = right - left;
// Space available for child
- auto childSpace = width - LayoutLength( padding.start ) - LayoutLength( padding.end );
+ auto childSpace = width - padding.start - padding.end;
auto count = GetChildCount();
switch ( mAlignment & VERTICAL_ALIGNMENT_MASK )
case Dali::Toolkit::LinearLayout::Alignment::BEGIN:
default:
{
- childLeft = LayoutLength( padding.start ) + LayoutLength( childMargin.start );
+ childLeft = LayoutLength( padding.start ) + childMargin.start;
break;
}
case Dali::Toolkit::LinearLayout::Alignment::END:
{
- childLeft = width - LayoutLength( padding.end ) - childWidth - LayoutLength( childMargin.end );
+ childLeft = width - padding.end - childWidth - childMargin.end;
break;
}
case Dali::Toolkit::LinearLayout::Alignment::CENTER_HORIZONTAL:
{
- childLeft = LayoutLength( padding.start ) + ( childSpace - childWidth ) / 2 + LayoutLength( childMargin.start ) - LayoutLength( childMargin.end );
+ childLeft = LayoutLength( padding.start ) + ( childSpace - childWidth ) / 2 + childMargin.start - childMargin.end;
break;
}
}
childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
- childTop += childHeight + LayoutLength( childMargin.bottom ) + mCellPadding.height;
+ childTop += childHeight + childMargin.bottom + mCellPadding.height;
}
}
}
auto width = right - left;
// Space available for child
- auto childSpace = width - LayoutLength( padding.start ) - LayoutLength( padding.end );
+ auto childSpace = width - padding.start - padding.end;
auto count = GetChildCount();
for( unsigned int childIndex = 0; childIndex < count; childIndex++)
auto childMargin = childLayout->GetMargin();
childTop += childMargin.top;
- childLeft = ( childSpace - childWidth ) / 2 + LayoutLength( childMargin.start ) - LayoutLength( childMargin.end );
+ childLeft = ( childSpace - childWidth ) / 2 + childMargin.start - childMargin.end;
childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
- childTop += childHeight + LayoutLength( childMargin.bottom ) + mCellPadding.height;
+ childTop += childHeight + childMargin.bottom + mCellPadding.height;
}
}
}
Dali::WrapMode::Type mWrapModeU:3;
Dali::WrapMode::Type mWrapModeV:3;
- DevelAnimatedImageVisual::Action::Type mActionStatus:3;
+ DevelAnimatedImageVisual::Action::Type mActionStatus:2;
bool mStartFirstFrame:1;
};
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:4; ///< The load state showing the load progress of the Texture
+ LoadState loadState:3; ///< 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:2; ///< CPU storage / GPU upload;
+ StorageType storageType:1; ///< CPU storage / GPU upload;
bool loadSynchronously:1; ///< True if synchronous loading was requested
- UseAtlas useAtlas:2; ///< USE_ATLAS if an atlas was requested.
+ UseAtlas useAtlas:1; ///< 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
# 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