X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fcommon%2Fproperty-condition-step-functions.cpp;h=92110fd88f42c5a4a94af0a4bc93ebac1cd277f6;hb=1e28f8a0ed5fba44d7c7e255d1d7932f7f2ce7eb;hp=813247d30340037a38c32d7e7b72b431c67fd639;hpb=d1988b8e36e06c845549ab2d492e2e1a28bff560;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/update/common/property-condition-step-functions.cpp b/dali/internal/update/common/property-condition-step-functions.cpp index 813247d..92110fd 100644 --- a/dali/internal/update/common/property-condition-step-functions.cpp +++ b/dali/internal/update/common/property-condition-step-functions.cpp @@ -1,18 +1,19 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.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://floralicense.org/license/ -// -// 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. -// +/* + * 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 @@ -50,6 +51,11 @@ ConditionFunction Step::GetFunction(Property::Type valueType) function = EvalFloat; break; } + case Property::INTEGER: + { + function = EvalInteger; + break; + } case Property::VECTOR2: { function = EvalVector2; @@ -99,6 +105,12 @@ bool Step::EvalFloat( const Dali::PropertyInput& value, PropertyNotification::Ra return Evaluate( propertyValue, arg ); } +bool Step::EvalInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg ) +{ + const float propertyValue = static_cast( value.GetInteger() ); + return Evaluate( propertyValue, arg ); +} + bool Step::EvalVector2( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg ) { const float propertyValue = value.GetVector2().LengthSquared();