-GBS Builds
-==========
+T.O.C.
+======
-NON-SMACK Targets
------------------
+ 1. GBS Builds
+ 1.1. NON-SMACK Targets
+ 1.2. SMACK enabled Targets
+ 2. Building for Ubuntu desktop
+ 2.1. Minimum Requirements
+ 2.2. Building the Repository
-gbs build -A [TARGET_ARCH]
-SMACK enabled Targets
----------------------
-gbs build -A [TARGET_ARCH] --define "%enable_dali_smack_rules 1"
+1. GBS Builds
+=============
+
+1.1. NON-SMACK Targets
+----------------------
+
+ gbs build -A [TARGET_ARCH]
+
+1.2. SMACK enabled Targets
+--------------------------
+
+ gbs build -A [TARGET_ARCH] --define "%enable_dali_smack_rules 1"
+
+
+
+2. Building for Ubuntu desktop
+==============================
+
+2.1. Minimum Requirements
+------------------------
+
+ - Ubuntu 14.04
+ - Environment created using dali_env script in dali-core repository
+
+2.2. Building the Repository
+----------------------------
+
+To build the repository enter the 'build/tizen' folder:
+
+ cd dali-toolkit/build/tizen
+
+Then run the following commands:
+
+ autoreconf --install
+ ./configure --prefix=$DESKTOP_PREFIX
+ make install -j8
+
#include <dali/public-api/dali-core.h>
#include <dali/integration-api/core.h>
#include <dali/integration-api/gl-abstraction.h>
+#include <dali/integration-api/gl-defines.h>
#include "test-trace-call-stack.h"
namespace Dali
mActiveTextures[ mActiveTextureUnit ].mBoundTextures.push_back( texture );
}
}
+
+ std::stringstream out;
+ out << target << ", " << texture;
+ mTextureTrace.PushCall("BindTexture", out.str());
}
inline void BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
*(textures+i) = ++mLastAutoTextureIdUsed;
}
}
+
+ std::stringstream out;
+ for(int i=0; i<n; i++)
+ {
+ out << textures[i];
+ if(i<n-1)
+ {
+ out << ", ";
+ }
+ }
+ mTextureTrace.PushCall("GenTexture", out.str());
}
inline void GetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
}
}
+ inline std::string GetShaderSource(GLuint shader)
+ {
+ return mShaderSources[shader];
+ }
+
inline void StencilFunc(GLenum func, GLint ref, GLuint mask)
{
}
inline void TexParameterf(GLenum target, GLenum pname, GLfloat param)
{
+ std::stringstream out;
+ out << target << ", " << pname << ", " << param;
+ mTexParamaterTrace.PushCall("TexParameterf", out.str());
}
inline void TexParameterfv(GLenum target, GLenum pname, const GLfloat* params)
{
+ std::stringstream out;
+ out << target << ", " << pname << ", " << params[0];
+ mTexParamaterTrace.PushCall("TexParameterfv", out.str());
}
inline void TexParameteri(GLenum target, GLenum pname, GLint param)
{
+ std::stringstream out;
+ out << target << ", " << pname << ", " << param;
+ mTexParamaterTrace.PushCall("TexParameteri", out.str());
}
inline void TexParameteriv(GLenum target, GLenum pname, const GLint* params)
{
+ std::stringstream out;
+ out << target << ", " << pname << ", " << params[0];
+ mTexParamaterTrace.PushCall("TexParameteriv", out.str());
}
inline void TexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels)
inline void ResetTextureCallStack() { mTextureTrace.Reset(); }
inline TraceCallStack& GetTextureTrace() { return mTextureTrace; }
+ //Methods for Texture verification
+ inline void EnableTexParameterCallTrace(bool enable) { mTexParamaterTrace.Enable(enable); }
+ inline void ResetTexParameterCallStack() { mTexParamaterTrace.Reset(); }
+ inline TraceCallStack& GetTexParameterTrace() { return mTexParamaterTrace; }
+
//Methods for Draw verification
inline void EnableDrawCallTrace(bool enable) { mDrawTrace.Enable(enable); }
inline void ResetDrawCallStack() { mDrawTrace.Reset(); }
TraceCallStack mCullFaceTrace;
TraceCallStack mShaderTrace;
TraceCallStack mTextureTrace;
+ TraceCallStack mTexParamaterTrace;
TraceCallStack mDrawTrace;
// Shaders & Uniforms
*/
void TestPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request)
{
- mTrace.PushCall("LoadResource", "");
+ std::ostringstream out;
+ out << "Type:";
+ if( request.GetType()->id == Integration::ResourceText )
+ {
+ out << "Text";
+ }
+ else
+ {
+ out << request.GetType()->id;
+ }
+ out << ", Path: " << request.GetPath() << std::endl ;
+
+ mTrace.PushCall("LoadResource", out.str());
if(mRequest != NULL)
{
delete mRequest;
--- /dev/null
+#ifndef _TEST_TOUCH_UTILS_H_
+#define _TEST_TOUCH_UTILS_H_
+
+/*
+ * 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 <dali/public-api/actors/actor.h>
+
+namespace Dali
+{
+
+// Data for touch events
+struct TouchEventData
+{
+ TouchEventData()
+ : functorCalled(false),
+ receivedTouch(),
+ touchActor()
+ {
+ }
+
+ void Reset()
+ {
+ functorCalled = false;
+
+ receivedTouch.points.clear();
+ receivedTouch.time = 0;
+
+ touchActor = NULL;
+ }
+
+ bool functorCalled;
+ TouchEvent receivedTouch;
+ Actor touchActor;
+};
+
+// Functor that sets the data when called
+struct TouchEventDataFunctor
+{
+ TouchEventDataFunctor(TouchEventData& data) : touchEventData(data) { }
+
+ bool operator()(Actor actor, const TouchEvent& touch)
+ {
+ touchEventData.functorCalled = true;
+ touchEventData.touchActor = actor;
+ touchEventData.receivedTouch = touch;
+ return false;
+ }
+
+ // Generate a touch-event
+ Integration::TouchEvent GenerateSingleTouch( TouchPoint::State state, Vector2 screenPosition ) const
+ {
+ Integration::TouchEvent touchEvent;
+ touchEvent.points.push_back( TouchPoint ( 0, state, screenPosition.x, screenPosition.y ) );
+ return touchEvent;
+ }
+
+ TouchEventData& touchEventData;
+};
+
+
+} // namespace Dali
+
+#endif // _TEST_TOUCH_UTILS_H_
*/
void TraceCallStack::Enable(bool enable) { mTraceActive = enable; }
+bool TraceCallStack::IsEnabled() { return mTraceActive; }
+
/**
* Push a call onto the stack if the trace is active
* @param[in] method The name of the method
return found;
}
+int TraceCallStack::CountMethod(std::string method) const
+{
+ int numCalls = 0;
+ for( size_t i=0; i < mCallStack.size(); i++ )
+ {
+ if( 0 == mCallStack[i][0].compare(method) )
+ {
+ numCalls++;
+ }
+ }
+ return numCalls;
+}
+
+
/**
* Search for a method in the stack with the given parameter list
* @param[in] method The name of the method
*/
void Enable(bool enable);
+ bool IsEnabled();
+
/**
* Push a call onto the stack if the trace is active
* @param[in] method The name of the method
bool FindMethod(std::string method) const;
/**
+ * Count how many times a method was called
+ * @param[in] method The name of the method
+ * @return The number of times it was called
+ */
+ int CountMethod(std::string method) const;
+
+ /**
* Search for a method in the stack with the given parameter list
* @param[in] method The name of the method
* @param[in] params A comma separated list of parameter values
DALI_ASSERT_ALWAYS( actorName && "Animation must specify actor name" );
DALI_ASSERT_ALWAYS( property && "Animation must specify a property name" );
- Actor targetActor = searchActor.FindChildByName( *actorName );
- DALI_ASSERT_ALWAYS( targetActor && "Actor must exist for property" );
+ Handle targetHandle = searchActor.FindChildByName( *actorName );
+ DALI_ASSERT_ALWAYS( targetHandle && "Actor must exist for property" );
- Property::Index idx( targetActor.GetPropertyIndex( *property ) );
+ Property::Index idx( targetHandle.GetPropertyIndex( *property ) );
- // A limitation here is that its possible that between binding to the signal and
- // the signal call that the ShaderEffect of the targetActor has been changed.
- // However this is a unlikely use case especially when using scripts.
+ // if the property is not found from the (actor) handle, try to downcast it to renderable actor
+ // to allow animating shader uniforms
if( idx == Property::INVALID_INDEX )
{
- if( ShaderEffect effect = targetActor.GetShaderEffect() )
+ RenderableActor renderable = RenderableActor::DownCast( targetHandle );
+ if( renderable )
{
- idx = effect.GetPropertyIndex( *property );
- if(idx != Property::INVALID_INDEX)
+ // A limitation here is that its possible that between creation of animation
+ // and running it the ShaderEffect of the actor has been changed.
+ // However this is a unlikely use case especially when using scripts.
+ if( ShaderEffect effect = renderable.GetShaderEffect() )
{
- targetActor = effect;
- }
- else
- {
- DALI_SCRIPT_WARNING( "Cannot find property on object or ShaderEffect\n" );
- continue;
+ idx = effect.GetPropertyIndex( *property );
+ if(idx != Property::INVALID_INDEX)
+ {
+ targetHandle = effect;
+ }
+ else
+ {
+ DALI_SCRIPT_WARNING( "Cannot find property on object or ShaderEffect\n" );
+ continue;
+ }
}
}
else
continue;
}
- Property prop( Property( targetActor, idx ) );
+ Property prop( Property( targetHandle, idx ) );
Property::Value propValue;
// these are the defaults
return baseHandle;
}
-
-ActorContainer Builder::GetTopLevelActors() const
-{
- // deprecated function.
- return ActorContainer();
-}
-
-Animation Builder::GetAnimation( const std::string &name ) const
-{
- // deprecated
- return Animation();
-}
-
void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replacement& constant )
{
const Stage& stage = Stage::GetCurrent();
if( SetPropertyFromNode( *image, Property::MAP, propertyMap, constant ) )
{
propertyMap.SetValue(KEYNAME_TYPE, Property::Value(std::string("FrameBufferImage")));
- ret = Dali::Scripting::NewImage( propertyMap );
+ ret = FrameBufferImage::DownCast( Dali::Scripting::NewImage( propertyMap ) );
mFrameBufferImageLut[ name ] = ret;
}
}
return ret;
}
-Font Builder::GetFont( const std::string& name ) const
-{
- // deprecated function.
- Font font;
- return font;
-}
-
-TextStyle Builder::GetTextStyle( const std::string& name ) const
-{
- // deprecated
- return TextStyle();
-}
-
-Image Builder::GetImage( const std::string& name) const
-{
- // deprecated function.
- return Image();
-}
-
-Actor Builder::GetActor( const std::string &name ) const
-{
- // deprecated function.
- return Actor();
-}
-
void Builder::AddActors( Actor toActor )
{
// 'stage' is the default/by convention section to add from
*/
BaseHandle Create( const std::string& templateName, const PropertyValueMap& map );
- /**
- * @copydoc Toolkit::Builder::GetFont
- */
- Font GetFont(const std::string &name) const;
-
- /**
- * @copydoc Toolkit::Builder::GetTextStyle
- */
- TextStyle GetTextStyle(const std::string &name) const;
-
- /**
- * @copydoc Toolkit::Builder::GetImage
- */
- Image GetImage(const std::string &name) const;
-
- /**
- * @copydoc Toolkit::Builder::GetActor
- */
- Actor GetActor( const std::string &name ) const;
-
/**
* @copydoc Toolkit::Builder::ApplyStyle
*/
bool ApplyStyle( const std::string& styleName, Handle& handle );
- void AnimateTo( const std::string& styleName, Handle& handle );
-
/**
* @copydoc Toolkit::Builder::AddActors
*/
void AddActors( const std::string §ionName, Actor toActor );
/**
- * @copydoc Toolkit::Builder::GetAnimation
- */
- Animation GetAnimation( const std::string &name ) const;
-
- /**
* @copydoc Toolkit::Builder::CreateRenderTask
*/
void CreateRenderTask( const std::string &name );
*/
FrameBufferImage GetFrameBufferImage( const std::string &name, const Replacement& constant );
- /**
- * @copydoc Toolkit::Builder::GetTopLevelActors
- */
- ActorContainer GetTopLevelActors( void ) const;
-
protected:
virtual ~Builder();
}
}
-void ScrollBar::SetBackgroundImage( Image image, const Vector4& border )
-{
- if (!mBackground )
- {
- mBackground = ImageActor::New( image );
- mBackground.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mBackground.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- Self().Add(mBackground);
- }
- else
- {
- mBackground.SetImage(image);
- }
- mBackground.SetNinePatchBorder( border );
- mBackground.SetStyle( ImageActor::STYLE_NINE_PATCH );
-}
-
void ScrollBar::SetIndicatorImage( Image image )
{
mIndicator.SetImage(image);
}
-void ScrollBar::SetIndicatorImage( Image image, const Vector4& border )
-{
- mIndicator.SetImage(image);
- mIndicator.SetNinePatchBorder( border );
- mIndicator.SetStyle( ImageActor::STYLE_NINE_PATCH );
-}
-
Actor ScrollBar::GetScrollIndicator()
{
return mIndicator;
// Properties
enum
{
- SCROLLBAR_PROPERTY_START_INDEX = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1,
+ SCROLLBAR_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
SCROLLBAR_PROPERTY_END_INDEX = SCROLLBAR_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
};
void OnScrollConnectorSet( Toolkit::ScrollConnector connector );
/**
- * @copydoc Toolkit::ScrollBar::SetBackgroundImage()
- */
- void SetBackgroundImage( Image image, const Vector4& border );
-
- /**
* @copydoc Toolkit::ScrollBar::SetIndicatorImage()
*/
void SetIndicatorImage( Image image );
/**
- * @copydoc Toolkit::ScrollBar::SetIndicatorImage()
- */
- void SetIndicatorImage( Image image, const Vector4& border );
-
- /**
* @copydoc Toolkit::ScrollBar::GetScrollIndicator()
*/
Actor GetScrollIndicator();
: Scrollable(),
mItemFactory(factory),
mActiveLayout(NULL),
- mDefaultAlphaFunction(Dali::Constraint::DEFAULT_ALPHA_FUNCTION),
mAnimatingOvershootOn(false),
mAnimateOvershootOff(false),
mAnchoringEnabled(true),
}
}
-void ItemView::SetDefaultAlphaFunction(AlphaFunction func)
-{
- mDefaultAlphaFunction = func;
-}
-
-AlphaFunction ItemView::GetDefaultAlphaFunction() const
-{
- return mDefaultAlphaFunction;
-}
-
void ItemView::OnRefreshNotification(PropertyNotification& source)
{
if(mRefreshEnabled || mScrollAnimation)
void ActivateLayout(unsigned int layoutIndex, const Vector3& targetSize, float durationSeconds);
/**
- * @copydoc Toolkit::ItemView::SetDefaultAlphaFunction
- */
- void SetDefaultAlphaFunction(AlphaFunction func);
-
- /**
- * @copydoc Toolkit::ItemView::GetDefaultAlphaFunction
- */
- AlphaFunction GetDefaultAlphaFunction() const;
-
- /**
* @copydoc Toolkit::ItemView::DeactivateCurrentLayout
*/
void DeactivateCurrentLayout();
ItemLayout* mActiveLayout;
Vector3 mActiveLayoutTargetSize;
- AlphaFunction mDefaultAlphaFunction;
-
Animation mResizeAnimation;
Animation mScrollAnimation;
Animation mScrollOvershootAnimation;
Self().SetProperty(mPropertyWrap, enable);
}
-int ScrollView::GetRefreshInterval() const
-{
- return mScrollUpdateDistance;
-}
-
-void ScrollView::SetRefreshInterval(int milliseconds)
-{
- mScrollUpdateDistance = milliseconds;
-}
-
int ScrollView::GetScrollUpdateDistance() const
{
return mScrollUpdateDistance;
void SetWrapMode(bool enable);
/**
- * @deprecated
- * @copydoc Toolkit::ScrollView::GetRefreshInterval
- */
- int GetRefreshInterval() const;
-
- /**
- * @deprecated
- * @copydoc Toolkit::ScrollView::SetRefreshInterval
- */
- void SetRefreshInterval(int milliseconds);
-
- /**
* @copydoc Toolkit::ScrollView::GetScrollupdateDistance
*/
int GetScrollUpdateDistance() const;
return handleGrabArea;
}
-Actor CreateHandle( const Vector3& anchorPoint, const Image& handleImage, const std::string& name )
+ImageActor CreateHandle( const Vector3& anchorPoint, const Image& handleImage, const std::string& name )
{
DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextInputHandles: CreateSelectionHandle\n" );
{
SetWidthExceedPolicy(Toolkit::TextView::Original);
}
- else if(policyName == "Truncate")
- {
- SetWidthExceedPolicy(Toolkit::TextView::Truncate);
- }
else if(policyName == "Fade")
{
SetWidthExceedPolicy(Toolkit::TextView::Fade);
{
SetHeightExceedPolicy(Toolkit::TextView::Original);
}
- else if(policyName == "Truncate")
- {
- SetHeightExceedPolicy(Toolkit::TextView::Truncate);
- }
else if(policyName == "Fade")
{
SetHeightExceedPolicy(Toolkit::TextView::Fade);
return GetImpl(*this).CreateAnimation( animationName, map, sourceActor );
}
-BaseHandle Builder::CreateFromStyle( const std::string& styleName )
-{
- return BaseHandle();
-}
-
-BaseHandle Builder::CreateFromStyle( const std::string& styleName, const PropertyValueMap& map )
-{
- return BaseHandle();
-}
-
BaseHandle Builder::Create( const std::string& templateName )
{
return GetImpl(*this).Create( templateName );
GetImpl(*this).AddActors( sectionName, toActor );
}
-Font Builder::GetFont( const std::string &name ) const
-{
- return GetImpl(*this).GetFont( name );
-}
-
-TextStyle Builder::GetTextStyle( const std::string &name ) const
-{
- return GetImpl(*this).GetTextStyle( name );
-}
-
-Image Builder::GetImage( const std::string &name ) const
-{
- return GetImpl(*this).GetImage( name );
-}
-
-Actor Builder::GetActor( const std::string &name ) const
-{
- return GetImpl(*this).GetActor( name );
-}
-
-Animation Builder::GetAnimation( const std::string &name ) const
-{
- return GetImpl(*this).GetAnimation( name );
-}
-
void Builder::CreateRenderTask( const std::string &name )
{
GetImpl(*this).CreateRenderTask( name );
return GetImpl(*this).GetFrameBufferImage( name );
}
-ActorContainer Builder::GetTopLevelActors( void ) const
-{
- return GetImpl(*this).GetTopLevelActors();
-}
-
} // namespace Toolkit
} // namespace Dali
Animation CreateAnimation( const std::string& animationName, const PropertyValueMap& map, Dali::Actor sourceActor );
/**
- * @deprecated Use Create()
- */
- BaseHandle CreateFromStyle( const std::string& styleName );
-
- /**
- * @deprecated Use Create()
- */
- BaseHandle CreateFromStyle( const std::string& styleName, const PropertyValueMap& map );
-
- /**
* @brief Creates an object (e.g. an actor) from the set of known style templates
*
* e.g.
void AddActors( const std::string §ionName, Actor toActor );
/**
- * @deprecated Font as a separate asset is no longer supported
- * Get's a Font asset previously created at load time
- * An empty handle is returned otherwise.
- * @pre The Builder has been initialized.
- * @param name The name given to a Font in the loaded representation
- * @return A handle to a Font if found, otherwise empty.
- */
- Font GetFont( const std::string &name ) const;
-
- /**
- * Get's a TextStyle asset previously created at load time
- * @pre The Builder has been initialized.
- * @param name The name given to a TextStyle in the loaded representation
- * @return a Created TextStyle if found, otherwise return a TextStyle created by Default constructor
- */
- TextStyle GetTextStyle( const std::string &name ) const;
-
- /**
- * @deprecated Images as a separate asset is no longer supported
- * Get's an Image asset previously created at load time
- * An empty handle is returned otherwise.
- * @pre The Builder has been initialized.
- * @param name The name given to an Image in the loaded representation
- * @return A handle to an Image if found, otherwise empty
- */
- Image GetImage( const std::string &name ) const;
-
- /**
- * @deprecated Actors no longer held by builder
- * Get's an Actor previously created at load time
- * An empty handle is returned otherwise.
- * @pre The Builder has been initialized.
- * @param name The name given to an Actor in the loaded representation
- * @return A handle to an Actor if found, otherwise empty
- */
- Actor GetActor( const std::string &name ) const;
-
- /**
- * @deprecated Animations no longer held by builder
- * Get's an Animation previously created at load time
- * An empty handle is returned otherwise.
- * @pre The Builder has been initialized.
- * @param name The name given to an Animation in the loaded representation
- * @return A handle to an Animation if found, otherwise empty
- */
- Animation GetAnimation( const std::string &name ) const;
-
- /**
* Create a render task set.
* @pre The Builder has been initialized.
* @param name The library name of the render task set.
*/
FrameBufferImage GetFrameBufferImage( const std::string &name );
- /**
- * @deprecated. Builder no longer holds actor handles/references
- * Provides a list of the top level actors previously created at load time
- * @return A container of Actors found at the top level of the loaded representation
- */
- ActorContainer GetTopLevelActors( void ) const;
-
private:
Builder(Internal::Builder *impl);
Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
// Register for style changes
- styleManager.StyleChangeSignal().Connect( this, &ControlImpl::DoStyleChange );
+ styleManager.StyleChangeSignal().Connect( this, &Control::DoStyleChange );
// SetTheme
GetImpl( styleManager ).ApplyThemeStyle( GetOwner() );
}
else if( change.defaultFontChange || change.defaultFontSizeChange )
{
- // This OnStyleChange(StyleChange change ) is deprecated, use OnFontChange instead
- OnStyleChange( change );
-
OnFontChange( change.defaultFontChange, change.defaultFontSizeChange );
}
}
return mImpl->GetConnectionCount();
}
-Control::Control( bool requiresTouchEvents )
-: CustomActorImpl( requiresTouchEvents ),
- mImpl(new Impl(*this))
-{
-}
-
Control::Control( ControlBehaviour behaviourFlags )
: CustomActorImpl( behaviourFlags & REQUIRES_TOUCH_EVENTS ),
mImpl(new Impl(*this))
virtual void OnFontChange( bool defaultFontChange, bool defaultFontSizeChange ){ }
/**
- * @deprecated Use OnFontChange() instead.
- * Before the using of StyleManager, the StyleChange only deals with font change.
- *
- * @brief This method should be overridden by deriving classes when
- * they wish to be notified when the style changes.
- *
- * @param[in] change Information denoting what has changed.
- */
- virtual void OnStyleChange( StyleChange change ) { }
-
- /**
* @brief Called whenever a pinch gesture is detected on this control.
*
* This can be overridden by deriving classes when pinch detection
};
/**
- * @deprecated Use the constructor taking flags instead
- * @brief Create a Control.
- *
- * @param[in] requiresTouchEvents True if the OnTouchEvent() callback is required.
- */
- Control(bool requiresTouchEvents);
-
- /**
* @brief Create a Control.
*
* @param[in] behaviourFlags Behavioural flags from ControlBehaviour enum
} // namespace Internal
-typedef Internal::Control ControlImpl; ///< @deprecated, Use Internal::Control
-
} // namespace Toolkit
} // namespace Dali
{
}
-void ScrollBar::SetBackgroundImage( Image image, const Vector4& border )
-{
- GetImpl(*this).SetBackgroundImage(image, border);
-}
-
void ScrollBar::SetIndicatorImage( Image image )
{
GetImpl(*this).SetIndicatorImage(image);
}
-void ScrollBar::SetIndicatorImage( Image image, const Vector4& border )
-{
- GetImpl(*this).SetIndicatorImage(image, border);
-}
-
Actor ScrollBar::GetScrollIndicator()
{
return GetImpl(*this).GetScrollIndicator();
static ScrollBar DownCast( BaseHandle handle );
/**
- * @brief Sets the image for the background of scroll indicator.
- *
- * @pre The scroll bar actor has been initialised.
- *
- * The background image is resized (stretched according to scale settings),
- * to the size of the ScrollBar.
- *
- * @param[in] image The image to cover background
- * @param[in] border The nine patch border for the image.
- *
- * @deprecated Use Control::SetBackground()
- */
- void SetBackgroundImage( Image image, const Vector4& border );
-
- /**
* @brief Sets the image for the indicator of scroll bar.
*
* @pre The scroll bar actor has been initialised.
void SetIndicatorImage( Image image );
/**
- * @brief Sets the image for the indicator of scroll bar.
- *
- * @pre The scroll bar actor has been initialised.
- *
- * The indicator image is resized (stretched according to scale settings),
- * to reflect the size of the scroll indicator and minimum/maximum limits
- * of the scroll position.
- *
- * @param[in] image The image of indicator that moves to indicate the current scroll position.
- * @param[in] border The nine patch border for the image.
- *
- * @deprecated Use the new 9-patch API
- */
- void SetIndicatorImage( Image image, const Vector4& border );
-
- /**
* @brief Gets the indicator of scroll bar.
*
* @pre The scroll bar actor has been initialised.
Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast( itemViewActor );
if(itemView && scrollPositionObject)
{
- ///!ToDo: Remove this once AlphaFunction in itemview is removed
- if( itemView.GetDefaultAlphaFunction() != Constraint::DEFAULT_ALPHA_FUNCTION )
- {
- mAlphaFunction = itemView.GetDefaultAlphaFunction();
- }
-
Property::Index scrollSpeedProperty = itemView.GetPropertyIndex("item-view-scroll-speed");
Property::Index scrollPositionProperty = scrollPositionObject.GetPropertyIndex("scroll-position");
GetImpl(*this).DeactivateCurrentLayout();
}
-void ItemView::SetDefaultAlphaFunction(AlphaFunction func)
-{
- GetImpl(*this).SetDefaultAlphaFunction(func);
-}
-
-AlphaFunction ItemView::GetDefaultAlphaFunction() const
-{
- return GetImpl(*this).GetDefaultAlphaFunction();
-}
-
void ItemView::SetMinimumSwipeSpeed(float speed)
{
GetImpl(*this).SetMinimumSwipeSpeed(speed);
void DeactivateCurrentLayout();
/**
- * @brief Set default the alpha function used when applying constraints e.g. during ActivateLayout().
- *
- * @deprecated Use SetAlphaFunction() in the layout
- * @param[in] func The default alpha function to use.
- */
- void SetDefaultAlphaFunction(AlphaFunction func);
-
- /**
- * @brief Retrieve the default alpha function used when applying constraints
- *
- * @deprecated Use GetAlphaFunction() in the layout
- * @return The default alpha function.
- */
- AlphaFunction GetDefaultAlphaFunction() const;
-
- /**
* @brief Set the minimum swipe speed in pixels per second; A pan
* gesture must exceed this to trigger a swipe.
*
ItemLayout::QuaternionFunction mRotationConstraint[4];
ItemLayout::Vector4Function mColorConstraint;
-
- NavigationLayout::NavigationSignalV2 mSignalPanV2;/*the signal to notify the application the selected item*/
};
NavigationLayoutPtr NavigationLayout::New()
int firstItemIndex = std::max(0.0f, -firstItemPosition -1.0f );
int lastItemIndex = std::max(0.0f, -(firstItemPosition) + itemsPerPage );
- mImpl->mSignalPanV2.Emit(lastItemIndex - mImpl->mNumberOfColumns);
return ItemRange(firstItemIndex , lastItemIndex );
}
return true;
}
-NavigationLayout::NavigationSignalV2& NavigationLayout::PanSignal()
-{
- return mImpl->mSignalPanV2;
-}
-
Degree NavigationLayout::GetScrollDirection() const
{
Degree scrollDirection(0);
const float sideMargin)> ResizeFunction;
/**
- * @deprecated This should not have been added to an ItemLayout
- */
- typedef SignalV2< void (int) > NavigationSignalV2;
-
- /**
* Create a new navigation layout
*/
static NavigationLayoutPtr New();
virtual ~NavigationLayout();
/**
- * Get the pan signal
- */
- NavigationSignalV2& PanSignal();
-
- /**
* Set the number of columns in the layout.
* @param[in] columns The number of columns.
*/
GetImpl(*this).SetRulerY(ruler);
}
-void ScrollView::SetRulerScaleX(RulerPtr ruler)
-{
- DALI_LOG_ERROR( "Deprecated" );
-}
-
-void ScrollView::SetRulerScaleY(RulerPtr ruler)
-{
- DALI_LOG_ERROR( "Deprecated" );
-}
-
void ScrollView::SetScrollSensitive(bool sensitive)
{
GetImpl(*this).SetScrollSensitive(sensitive);
GetImpl(*this).SetWrapMode(enable);
}
-int ScrollView::GetRefreshInterval() const
-{
- return GetImpl(*this).GetRefreshInterval();
-}
-
-void ScrollView::SetRefreshInterval(int milliseconds)
-{
- GetImpl(*this).SetRefreshInterval(milliseconds);
-}
-
int ScrollView::GetScrollUpdateDistance() const
{
return GetImpl(*this).GetScrollUpdateDistance();
GetImpl(*this).SetScrollPosition(position);
}
-Vector3 ScrollView::GetCurrentScrollScale() const
-{
- DALI_LOG_ERROR( "Deprecated" );
- return Vector3::ONE;
-}
-
unsigned int ScrollView::GetCurrentPage() const
{
return GetImpl(*this).GetCurrentPage();
}
-void ScrollView::TransformTo(const Vector3& position, const Vector3& scale, float rotation)
-{
- DALI_LOG_ERROR( "Deprecated" );
-
- GetImpl(*this).TransformTo(position);
-}
-
-void ScrollView::TransformTo(const Vector3& position, const Vector3& scale, float rotation, float duration)
-{
- DALI_LOG_ERROR( "Deprecated" );
-
- GetImpl(*this).TransformTo(position, duration);
-}
-
void ScrollView::ScrollTo(const Vector3 &position)
{
GetImpl(*this).ScrollTo(position);
return GetImpl(*this).ScrollToSnapPoint();
}
-void ScrollView::ScaleTo(const Vector3 &scale)
-{
- DALI_LOG_ERROR( "Deprecated" );
-}
-
-void ScrollView::ScaleTo(const Vector3 &scale, float duration)
-{
- DALI_LOG_ERROR( "Deprecated" );
-}
-
void ScrollView::ApplyConstraintToChildren(Constraint constraint)
{
GetImpl(*this).ApplyConstraintToChildren(constraint);
void SetRulerY(RulerPtr ruler);
/**
- * @brief Set Scale-X axis ruler.
- *
- * Defines how scaling horizontally is snapped, and the extent
- * (domain) to which scaling can be performed e.g. 10% to 200%
- *
- * @param[in] ruler The ruler to be used for the Scale-X axis
- *
- * @deprecated Scaling not supported
- */
- void SetRulerScaleX(RulerPtr ruler);
-
- /**
- * @brief Set Scale-Y axis ruler.
- *
- * Defines how scaling vertically is snapped, and the extent
- * (domain) to which scaling can be performed e.g. 10% to 200%
- *
- * @param[in] ruler The ruler to be used for the Scale-Y axis
- *
- * @deprecated Scaling not supported
- */
- void SetRulerScaleY(RulerPtr ruler);
-
- /**
* @brief Set Scroll's touch sensitivity.
*
* @note Unlike SetSensitive(), this determines whether this ScrollView
void SetWrapMode(bool enable);
/**
- * @deprecated
- * @brief Gets the current refresh interval in milliseconds.
- *
- * @return Current refresh interval in milliseconds
- */
- int GetRefreshInterval() const;
-
- /**
- * @deprecated
- * @brief Sets the refresh interval in milliseconds.
- *
- * The refresh interval is a notification signal
- * (SignalScrollUpdate), that is periodically fired when scrolling
- * animation is occuring.
- *
- * When set to 0. No update signals are sent.
- *
- * @param[in] milliseconds The frequency of the event in milliseconds
- */
- void SetRefreshInterval(int milliseconds);
-
- /**
* @brief Gets the current distance needed to scroll for ScrollUpdatedSignal to be emitted
*
* @return Current scroll update distance
void SetScrollPosition(const Vector3& position);
/**
- * @brief Retrieves current scroll scale.
- *
- * @returns The current scroll scale.
- *
- * @deprecated Scaling not supported
- */
- Vector3 GetCurrentScrollScale() const;
-
- /**
* @brief Retrieves current scroll page based on ScrollView
* dimensions being the size of one page, and all pages laid out in
* a grid fashion, increasing from left to right until the end of
unsigned int GetCurrentPage() const;
/**
- * @brief Transforms View to position, scale and rotation specified.
- *
- * @param[in] position The position to transform to.
- * @param[in] scale The scale to transform to.
- * @param[in] rotation The rotation to transform to.
- *
- * @deprecated Scaling or rotation not supported, use ScrollTo(const Vector3&)
- */
- void TransformTo(const Vector3& position, const Vector3& scale, float rotation);
-
- /**
- * @brief Transforms View to position, scale and rotation specified in the duration specified.
- *
- * @param[in] position The position to transform to.
- * @param[in] scale The scale to transform to.
- * @param[in] rotation The rotation to transform to.
- * @param[in] duration The duration for this animation in seconds.
- *
- * @deprecated Scaling or rotation not supported, use ScrollTo(const Vector3&, float)
- */
- void TransformTo(const Vector3& position, const Vector3& scale, float rotation, float duration);
-
- /**
* @brief Scrolls View to position specified (contents will scroll to this position).
*
* Position 0,0 is the origin. Increasing X scrolls contents left, while
bool ScrollToSnapPoint();
/**
- * @brief Scales View to (scale).
- *
- * @param[in] scale The scale factor the animate to.
- *
- * @deprecated Scaling not supported
- */
- void ScaleTo(const Vector3& scale);
-
- /**
- * @brief Scales View to (scale).
- *
- * @param[in] scale The scale factor the animate to.
- * @param[in] duration The duration of the animation in seconds.
- *
- * @deprecated Scaling not supported
- */
- void ScaleTo(const Vector3& scale, float duration);
-
- /**
* @brief Applies a constraint that will affect the children of ScrollView.
*
* @note this affects all existing and future Actors that are added to scrollview.
enum ExceedPolicy
{
Original, ///< Will display the text in its original size. If a line, a word or a character is bigger than the TextView size it may exceed its boundary.
- Truncate, ///< @deprecated. Use Fade instead.
Fade, ///< Will display the text in its original size. It won't display the text which exceeds the TextView boundary. It fades the text out.
Split, ///< Will split the text in a new line.
ShrinkToFit, ///< Will shrink the text to fit the TextView boundary.
+++ /dev/null
-autoreconf --install
-./configure --prefix=$DESKTOP_PREFIX
-make install -j3
@code
void CreateProgram(Application& app)
{
- app.GetWindow().ShowIndicator(true);
+ app.GetWindow().ShowIndicator(Dali::Window::VISIBLE);
}
int main (int argc, char **argv)
<tr> <td>Default</td> <td>Properties defined within DALi Core, e.g. Dali::Actor, Dali::ShaderEffect default properties etc.</td> <td style="text-align:center;">0 to 9999999</td> </tr>
<tr> <td>Registered</td> <td>Properties registered using Dali::PropertyRegistration</td> <td style="text-align:center;">10000000 to 19999999</td> </tr>
<tr> <td>Control</td> <td>Property range reserved by Dali::Toolkit::Control</td> <td style="text-align:center;">10000000 to 10001000<br>
- \link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_START_INDEX CONTROL_PROPERTY_START_INDEX\endlink
- to \link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX CONTROL_PROPERTY_END_INDEX\endlink</td> </tr>
+ \link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_START_INDEX CONTROL_PROPERTY_START_INDEX\endlink
+ to \link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX CONTROL_PROPERTY_END_INDEX\endlink</td> </tr>
<tr> <td>Derived Control</td> <td>Property range for control deriving directly from Dali::Toolkit::Control</td> <td style="text-align:center;">10001001 to 19999999</td> </tr>
<tr> <td>Custom</td> <td>Custom properties added to instance using Dali::Handle::RegisterProperty</td> <td style="text-align:center;">50000000 onwards</td> </tr>
</table>
within the source file of the deriving control as shown in the code below.
<b>Please note:</b> This snippet assumes knowledge of the \link Dali::Toolkit::Control Control
-\endlink / \link Dali::Toolkit::ControlImpl ControlImpl \endlink creation process where
-<i><b>MyControl</b></i> derives from a Control and <i><b>MyControlImpl</b></i> derives from ControlImpl.
+\endlink / \link Dali::Toolkit::Internal::Control Internal::Control \endlink creation process where
+<i><b>MyControl</b></i> derives from a Control and <i><b>MyControlImpl</b></i> derives from Internal::Control.
@code
namespace
Furthermore, if deriving from \link Dali::Toolkit::Control Control\endlink, the control writer
needs to be aware of their parent class's property range. Control reserves a property range between
-\link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_START_INDEX ControlImpl::CONTROL_PROPERTY_START_INDEX\endlink
-and \link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX ControlImpl::CONTROL_PROPERTY_END_INDEX\endlink.
+\link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_START_INDEX ControlImpl::CONTROL_PROPERTY_START_INDEX\endlink
+and \link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX Internal::Control::CONTROL_PROPERTY_END_INDEX\endlink.
Any deriving control should start their property indices from
-\link Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX ControlImpl::CONTROL_PROPERTY_END_INDEX\endlink + 1.
+\link Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX Internal::Control::CONTROL_PROPERTY_END_INDEX\endlink + 1.
Please have a look at \ref property-indices for more information.
@code
// Define the indices we will use for the properties
-static const int PROPERTY_ONE( Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX + 1 );
-static const int PROPERTY_TWO( Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX + 2 );
-static const int PROPERTY_THREE( Dali::Toolkit::ControlImpl::CONTROL_PROPERTY_END_INDEX + 3 );
+static const int PROPERTY_ONE( Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX + 1 );
+static const int PROPERTY_TWO( Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX + 2 );
+static const int PROPERTY_THREE( Dali::Toolkit::Internal::Control::CONTROL_PROPERTY_END_INDEX + 3 );
Dali::PropertyRegistration property1(
type, // Reference to type registration object (see above)
ImageRotation GetSourceRotation() const;
/**
- * @copydoc Dali::Toolkit::MaskedImageView::RenderFinishedSignal
- */
- Dali::RenderTask::RenderTaskSignalV2& RenderFinishedSignal()
- {
- return mRenderTask.FinishedSignal();
- }
-
- /**
* @copydoc Dali::Toolkit::MaskedImageView::MaskFinishedSignal
*/
Dali::Toolkit::MaskedImageView::MaskedImageViewSignal& MaskFinishedSignal();
return GetImpl(*this).GetSourceRotation();
}
-Dali::RenderTask::RenderTaskSignalV2& MaskedImageView::RenderFinishedSignal()
-{
- return GetImpl(*this).RenderFinishedSignal();
-}
-
MaskedImageView::MaskedImageViewSignal& MaskedImageView::MaskFinishedSignal()
{
return GetImpl(*this).MaskFinishedSignal();
*/
MaskedImageViewSignal& MaskFinishedSignal();
- /**
- * @deprecated Use MaskFinishedSignal() instead.
- * Signal emitted when the render task which targets the frame buffer of the masked image has finished.
- * @return the signal.
- */
- Dali::RenderTask::RenderTaskSignalV2& RenderFinishedSignal();
-
public: // Not intended for application developers
/**
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 3;
+const unsigned int TOOLKIT_MICRO_VERSION = 4;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
Name: dali-toolkit
Summary: The OpenGLES Canvas Core Library Toolkit
-Version: 1.0.3
+Version: 1.0.4
Release: 1
Group: System/Libraries
License: Apache-2.0
projects / platform / core / uifw / dali-toolkit.git / commitdiff