X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-depth-index-ranges.h;h=3aa0c9f637aa0330fd20bd49a4576d2df9e8c2b0;hb=d49f442b7f06823b87987242a755cfe96156d202;hp=f1bb8c38b752f1afe2b4cd755e275a041cc158a5;hpb=8147c2dfb1c1ae88c929cbad7329c27830842525;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/controls/control-depth-index-ranges.h b/dali-toolkit/devel-api/controls/control-depth-index-ranges.h index f1bb8c3..3aa0c9f 100644 --- a/dali-toolkit/devel-api/controls/control-depth-index-ranges.h +++ b/dali-toolkit/devel-api/controls/control-depth-index-ranges.h @@ -23,13 +23,10 @@ namespace Dali { - namespace Toolkit { - namespace DepthIndex { - // The negative value for background effect and background has been // chosen so that newer controls can have content without setting // depth index, and go in front of native controls with a background. @@ -40,18 +37,18 @@ namespace DepthIndex enum Ranges { - BACKGROUND_EFFECT = -2 * DevelLayer::SIBLING_ORDER_MULTIPLIER/100, - BACKGROUND = -1 * DevelLayer::SIBLING_ORDER_MULTIPLIER/100, - CONTENT = 0, - DECORATION = 1 * DevelLayer::SIBLING_ORDER_MULTIPLIER/100, - FOREGROUND_EFFECT = 2 * DevelLayer::SIBLING_ORDER_MULTIPLIER/100 + BACKGROUND_EFFECT = -2 * DevelLayer::SIBLING_ORDER_MULTIPLIER / 100, + BACKGROUND = -1 * DevelLayer::SIBLING_ORDER_MULTIPLIER / 100, + CONTENT = 0, + DECORATION = 1 * DevelLayer::SIBLING_ORDER_MULTIPLIER / 100, + FOREGROUND_EFFECT = 2 * DevelLayer::SIBLING_ORDER_MULTIPLIER / 100 }; -static_assert( (unsigned int)DevelLayer::ACTOR_DEPTH_MULTIPLIER > (unsigned int)DevelLayer::SIBLING_ORDER_MULTIPLIER ); -static_assert( BACKGROUND_EFFECT < BACKGROUND ); -static_assert( BACKGROUND < CONTENT ); -static_assert( CONTENT < DECORATION ); -static_assert( DECORATION < FOREGROUND_EFFECT ); +static_assert((unsigned int)DevelLayer::ACTOR_DEPTH_MULTIPLIER > (unsigned int)DevelLayer::SIBLING_ORDER_MULTIPLIER); +static_assert(BACKGROUND_EFFECT < BACKGROUND); +static_assert(BACKGROUND < CONTENT); +static_assert(CONTENT < DECORATION); +static_assert(DECORATION < FOREGROUND_EFFECT); } // namespace DepthIndex