X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscroll-connector.cpp;h=c89dfab6d82a83f2292fb33beb404b3cf370551f;hp=ef55cdb3fd142bc8ac2feb1e84bb98b5e3bd70b1;hb=d2c0a6de37f0166a6a4a9bd1b1017ffcc8f545cc;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp index ef55cdb..c89dfab 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp +++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.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 @@ -32,6 +33,7 @@ const Property::Index ScrollConnector::SCROLL_POSITION = Internal::ScrollConnect const Property::Index ScrollConnector::OVERSHOOT = Internal::ScrollConnector::OVERSHOOT; const char* const ScrollConnector::DOMAIN_CHANGED_SIGNAL_NAME = "domain-changed"; +const char* const ScrollConnector::SCROLL_POSITION_CHANGED_SIGNAL_NAME = "scroll-position-changed"; ScrollConnector ScrollConnector::New() { @@ -81,6 +83,21 @@ Constrainable ScrollConnector::GetScrollPositionObject() const return GetImpl(*this).GetScrollPositionObject(); } +void ScrollConnector::SetScrollPosition( float position ) +{ + GetImpl(*this).SetScrollPosition( position ); +} + +float ScrollConnector::GetScrollPosition() const +{ + return GetImpl(*this).GetScrollPosition(); +} + +ScrollConnector::ScrollPositionChangedSignalType& ScrollConnector::ScrollPositionChangedSignal() +{ + return GetImpl(*this).ScrollPositionChangedSignal(); +} + ScrollConnector::DomainChangedSignalType& ScrollConnector::DomainChangedSignal() { return GetImpl(*this).DomainChangedSignal();