{
const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
const unsigned int TOTAL_PAGE_NUMBER = 20;
-const Vector2 PAGE_SIZE( 300.f,400.f );
+const Vector2 VIEW_PAGE_SIZE( 300.f,400.f );
const Vector2 SPINE_SHADOW_PARAMETER( 60.0f, 30.0f );
static bool gObjectCreatedCallBackCalled;
// Test object creation
TestPageFactory factory;
- portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+ portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );
DALI_TEST_CHECK( portraitView );
//Additional check to ensure object is created by checking if it's registered
registry.ObjectCreatedSignal().Connect( &TestCallback );
{
TestPageFactory factory;
- PageTurnView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+ PageTurnView portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );
}
DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
// Test object creation
TestPageFactory factory;
- landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+ landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
DALI_TEST_CHECK( landscapeView );
//Additional check to ensure object is created by checking if it's registered
registry.ObjectCreatedSignal().Connect( &TestCallback );
{
TestPageFactory factory;
- PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+ PageTurnView landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
}
DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
// Test object creation
TestPageFactory factory;
- portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+ portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );
DALI_TEST_CHECK( portraitView );
// Test copy constructor
// Test object creation
TestPageFactory factory;
- landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+ landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
DALI_TEST_CHECK( landscapeView );
// Test copy constructor
tet_infoline(" UtcDaliPageTurnViewSetGetProperty ");
TestPageFactory factory;
- PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+ PageTurnView landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
DALI_TEST_CHECK( landscapeView );
Stage::GetCurrent().Add( landscapeView );
- // Test "pageSize" property
- DALI_TEST_CHECK( landscapeView.GetPropertyIndex("pageSize") == PageTurnView::Property::PAGE_SIZE );
- DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::PAGE_SIZE).Get<Vector2>(), PAGE_SIZE, TEST_LOCATION );
+ // Test "viewPageSize" property
+ DALI_TEST_CHECK( landscapeView.GetPropertyIndex("viewPageSize") == PageTurnView::Property::VIEW_PAGE_SIZE );
+ DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), VIEW_PAGE_SIZE, TEST_LOCATION );
- Vector2 newSize( PAGE_SIZE.x*0.75, PAGE_SIZE.y*0.5f );
- landscapeView.SetProperty( PageTurnView::Property::PAGE_SIZE, newSize );
- DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::PAGE_SIZE).Get<Vector2>(), newSize, TEST_LOCATION );
+ Vector2 newSize( VIEW_PAGE_SIZE.x*0.75, VIEW_PAGE_SIZE.y*0.5f );
+ landscapeView.SetProperty( PageTurnView::Property::VIEW_PAGE_SIZE, newSize );
+ DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize, TEST_LOCATION );
Wait( application);
DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*2.f, newSize.y), TEST_LOCATION);
- landscapeView.SetProperty( PageTurnView::Property::PAGE_SIZE,newSize*1.5f);
- DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::PAGE_SIZE).Get<Vector2>(), newSize*1.5f, TEST_LOCATION );
+ landscapeView.SetProperty( PageTurnView::Property::VIEW_PAGE_SIZE,newSize*1.5f);
+ DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize*1.5f, TEST_LOCATION );
Wait( application);
DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*3.f, newSize.y*1.5f), TEST_LOCATION);
ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
+ scrollView.SetSize( viewPageSize );
scrollView.SetParentOrigin( ParentOrigin::CENTER );
scrollView.SetAnchorPoint( AnchorPoint::CENTER );
scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
// Position rulers.
Property::Map rulerMap;
rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, true );
- rulerMap.Add( ScrollMode::X_AXIS_SNAP_TO_INTERVAL, pageSize.width );
- rulerMap.Add( ScrollMode::X_AXIS_SCROLL_BOUNDARY, pageSize.width*3 );
+ rulerMap.Add( ScrollMode::X_AXIS_SNAP_TO_INTERVAL, viewPageSize.width );
+ rulerMap.Add( ScrollMode::X_AXIS_SCROLL_BOUNDARY, viewPageSize.width*3 );
rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, false );
scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
// Confirm the final X coord has not moved more than one page from the start X position.
- DALI_TEST_GREATER( ( startPos.x + pageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
+ DALI_TEST_GREATER( ( startPos.x + viewPageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
// Finish the gesture and wait for the snap.
currentPos += direction;
time += Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
// Confirm the final X coord has snapped to exactly one page ahead of the start page.
- DALI_TEST_EQUALS( pageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+ DALI_TEST_EQUALS( viewPageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
END_TEST;
}
ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
+ scrollView.SetSize( viewPageSize );
scrollView.SetParentOrigin( ParentOrigin::CENTER );
scrollView.SetAnchorPoint( AnchorPoint::CENTER );
scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
Property::Map rulerMap;
rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, false );
rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
- rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, pageSize.height );
- rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, pageSize.height*3 );
+ rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, viewPageSize.height );
+ rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, viewPageSize.height*3 );
scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
scrollView.SetWrapMode( false );
Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
// Confirm the final X coord has not moved more than one page from the start X position.
- DALI_TEST_GREATER( ( startPos.y + pageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
+ DALI_TEST_GREATER( ( startPos.y + viewPageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
// Finish the gesture and wait for the snap.
currentPos += direction;
Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
// Confirm the final Y coord has snapped to exactly one page ahead of the start page.
- DALI_TEST_EQUALS( pageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+ DALI_TEST_EQUALS( viewPageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
END_TEST;
}
ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
+ scrollView.SetSize( viewPageSize );
scrollView.SetParentOrigin( ParentOrigin::CENTER );
scrollView.SetAnchorPoint( AnchorPoint::CENTER );
scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
Property::Map rulerMap;
rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, false );
rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
- rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, pageSize.height );
- rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, pageSize.height*3 );
+ rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, viewPageSize.height );
+ rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, viewPageSize.height*3 );
scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
scrollView.SetWrapMode( false );
Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
// Confirm the final X coord has not moved more than one page from the start X position.
- DALI_TEST_GREATER( ( startPos.y + pageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
+ DALI_TEST_GREATER( ( startPos.y + viewPageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
// Finish the gesture and wait for the snap.
currentPos += direction;
Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
// Confirm the final Y coord has snapped to exactly one page ahead of the start page.
- DALI_TEST_EQUALS( pageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+ DALI_TEST_EQUALS( viewPageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
END_TEST;
}
ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
+ scrollView.SetSize( viewPageSize );
scrollView.SetParentOrigin( ParentOrigin::TOP_LEFT );
scrollView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
+ scrollView.SetSize( viewPageSize );
scrollView.SetParentOrigin( ParentOrigin::CENTER );
scrollView.SetAnchorPoint( AnchorPoint::CENTER );
scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
// Position rulers.
// We set the X ruler to fixed to give us pages to snap to.
- Dali::Toolkit::FixedRuler* rulerX = new Dali::Toolkit::FixedRuler( pageSize.width );
+ Dali::Toolkit::FixedRuler* rulerX = new Dali::Toolkit::FixedRuler( viewPageSize.width );
// Note: The 3x page width is arbitary, but we need enough to show that we are
// capping page movement by the page limiter, and not the domain.
- rulerX->SetDomain( Dali::Toolkit::RulerDomain( 0.0f, pageSize.width * 3.0f, false ) );
+ rulerX->SetDomain( Dali::Toolkit::RulerDomain( 0.0f, viewPageSize.width * 3.0f, false ) );
Dali::Toolkit::RulerPtr rulerY = new Dali::Toolkit::DefaultRuler();
rulerY->Disable();
scrollView.SetRulerX( rulerX );
Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
// Confirm the final X coord has not moved more than one page from the start X position.
- DALI_TEST_GREATER( ( startPos.x + pageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
+ DALI_TEST_GREATER( ( startPos.x + viewPageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
// Finish the gesture and wait for the snap.
currentPos += direction;
time += Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
// Confirm the final X coord has snapped to exactly one page ahead of the start page.
- DALI_TEST_EQUALS( pageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+ DALI_TEST_EQUALS( viewPageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
END_TEST;
}
*/
// EXTERNAL INCLUDES
+#include <cctype>
#include <cstring>
+#include <string>
#include <algorithm>
// INTERNAL INCLUDES
{
}
-PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& pageSize )
+PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& viewPageSize )
{
- return Internal::PageTurnLandscapeView::New(pageFactory, pageSize);
+ return Internal::PageTurnLandscapeView::New(pageFactory, viewPageSize);
}
PageTurnLandscapeView PageTurnLandscapeView::DownCast( BaseHandle handle )
* @brief Create an initialized PageTurnLandscapeView control
* @SINCE_1_0.0
* @param[in] pageFactory The factory which provides PageTurnView with pages.
- * @param[in] pageSize The size of the page
+ * @param[in] viewPageSize The size of the page
* @return A handle to the PageTurnLandscapeView control.
*/
- static PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2& pageSize );
+ static PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2& viewPageSize );
/**
* @brief Downcast an Object handle to PageTurnPortraitView. If handle points to a PageTurnLandscapeView the
{
}
-PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& pageSize)
+PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& viewPageSize)
{
- return Internal::PageTurnPortraitView::New(pageFactory, pageSize);
+ return Internal::PageTurnPortraitView::New(pageFactory, viewPageSize);
}
PageTurnPortraitView PageTurnPortraitView::DownCast( BaseHandle handle )
* @brief Create an initialized PageTurnPortraitView control
* @SINCE_1_1.4
* @param[in] pageFactory The factory which provides PageTurnView with pages.
- * @param[in] pageSize The size of the page
+ * @param[in] viewPageSize The size of the page
* @return A handle to the PageTurnPortraitView control.
*/
- static PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& pageSize );
+ static PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& viewPageSize );
/**
* @brief Downcast an Object handle to PageTurnPortraitView. If handle points to a PageTurnPortraitView the
{
enum
{
- PAGE_SIZE = PROPERTY_START_INDEX, ///< name "pageSize", type Vector2 @SINCE_1_1.4
- CURRENT_PAGE_ID, ///< name "currentPageId", type Integer @SINCE_1_1.4
+ VIEW_PAGE_SIZE = PROPERTY_START_INDEX, ///< name "viewPageSize", type Vector2 @SINCE_1_1.4
+ CURRENT_PAGE_ID, ///< name "currentPageId", type Integer @SINCE_1_1.4
/**
* The two values are the major&minor radius (in pixels) to form an ellipse shape.
#include <fstream>
#include <sstream>
-#include <wordexp.h>
#include <stdio.h>
#include <unistd.h>
#include <dali/devel-api/adaptor-framework/file-loader.h>
-inline std::string ExpandPath(const std::string &name)
-{
- wordexp_t p;
- char** w;
- wordexp( name.c_str(), &p, 0 );
- w = p.we_wordv;
- std::stringstream s;
- for (size_t i=0; i<p.we_wordc;i++ )
- {
- s << w[i];
- }
- wordfree( &p );
- return s.str();
-}
-
-
-inline std::string ExePath(void)
-{
- char buf[256];
- ssize_t len = readlink("/proc/self/exe", buf, sizeof(buf) - 1);
- len = len > 0 ? len : 0;
- buf[len] = '\0';
- return std::string(buf);
-}
-
inline std::string GetFileContents(const std::string &fn)
{
std::streampos bufferSize = 0;
#include <dali-toolkit/internal/builder/json-parser-state.h>
// EXTERNAL INCLUDES
+#include <string>
#include <algorithm>
namespace Dali
const Pixel::Format EFFECTS_VIEW_DEFAULT_PIXEL_FORMAT = Pixel::RGBA8888;
const float ARBITRARY_FIELD_OF_VIEW = Math::PI / 4.0f;
-const Vector4 EFFECTS_VIEW_DEFAULT_BACKGROUND_COLOR( 1.0f, 1.0f, 1.0f, 0.0 );
+const Vector4 EFFECTS_VIEW_DEFAULT_BACKGROUND_COLOR( 0.0f, 0.0f, 0.0f, 0.0 );
const bool EFFECTS_VIEW_REFRESH_ON_DEMAND(false);
// Visuals are not stylable or public
}
-PageTurnLandscapeView::PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& pageSize )
-: PageTurnView( pageFactory, pageSize )
+PageTurnLandscapeView::PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& viewPageSize )
+: PageTurnView( pageFactory, viewPageSize )
{
}
PageTurnLandscapeView::~PageTurnLandscapeView()
{}
-Toolkit::PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& pageSize )
+Toolkit::PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& viewPageSize )
{
// Create the implementation, temporarily owned on stack
- IntrusivePtr< PageTurnLandscapeView > internalPageTurnView = new PageTurnLandscapeView( pageFactory, pageSize );
+ IntrusivePtr< PageTurnLandscapeView > internalPageTurnView = new PageTurnLandscapeView( pageFactory, viewPageSize );
// Pass ownership to CustomActor
Dali::Toolkit::PageTurnLandscapeView pageTurnView( *internalPageTurnView );
/**
* @copydoc Toolkit::PageTurnLandscapeView::New( PageFactory&, const Vector2& )
*/
- static Toolkit::PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2& pageSize );
+ static Toolkit::PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2& viewPageSize );
protected:
/**
* Constructor.
* It initializes the PageTurnPortraitView members
* @param[in] pageFactory The factory which provides image to PageTurnView as the page content.
- * @param[in] pageSize The size of the page
+ * @param[in] viewPageSize The size of the page
*/
- PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& pageSize );
+ PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& viewPageSize );
/**
* A reference counted object may only be deleted by calling Unreference()
}
-PageTurnPortraitView::PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize )
-: PageTurnView( pageFactory, pageSize )
+PageTurnPortraitView::PageTurnPortraitView( PageFactory& pageFactory, const Vector2& viewPageSize )
+: PageTurnView( pageFactory, viewPageSize )
{
}
{
}
-Toolkit::PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& pageSize )
+Toolkit::PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& viewPageSize )
{
// Create the implementation, temporarily owned on stack
- IntrusivePtr< PageTurnPortraitView > internalPageTurnView = new PageTurnPortraitView( pageFactory, pageSize );
+ IntrusivePtr< PageTurnPortraitView > internalPageTurnView = new PageTurnPortraitView( pageFactory, viewPageSize );
// Pass ownership to CustomActor
Dali::Toolkit::PageTurnPortraitView pageTurnView( *internalPageTurnView );
/**
* @copydoc Toolkit::PageTurnPortraitView::New( PageFactory&, const Vector2& )
*/
- static Toolkit::PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& pageSize );
+ static Toolkit::PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& viewPageSize );
protected:
* Constructor.
* It initializes the PageTurnPortraitView members
* @param[in] pageFactory The factory which provides image to PageTurnView as the page content.
- * @param[in] pageSize The size of the page
+ * @param[in] viewPageSize The size of the page
*/
- PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize );
+ PageTurnPortraitView( PageFactory& pageFactory, const Vector2& viewPageSize );
/**
* A reference counted object may only be deleted by calling Unreference()
// default grid density for page turn effect, 20 pixels by 20 pixels
const float DEFAULT_GRID_DENSITY(20.0f);
-// to bent the page, the minimal horizontal pan start position is pageSize.x * MINIMUM_START_POSITION_RATIO
+// to bent the page, the minimal horizontal pan start position is viewPageSize.x * MINIMUM_START_POSITION_RATIO
const float MINIMUM_START_POSITION_RATIO(0.6f);
-// the maximum vertical displacement of pan gesture, if exceed, will reduce it: pageSize.y * MAXIMUM_VERTICAL_MOVEMENT_RATIO
+// the maximum vertical displacement of pan gesture, if exceed, will reduce it: viewPageSize.y * MAXIMUM_VERTICAL_MOVEMENT_RATIO
const float MAXIMUM_VERTICAL_MOVEMENT_RATIO(0.15f);
-// when the x component of pan position reaches pageSize.x * PAGE_TURN_OVER_THRESHOLD_RATIO, page starts to turn over
+// when the x component of pan position reaches viewPageSize.x * PAGE_TURN_OVER_THRESHOLD_RATIO, page starts to turn over
const float PAGE_TURN_OVER_THRESHOLD_RATIO(0.5f);
// duration of animation, shorter for faster speed
// Setup properties, signals and actions using the type-registry.
DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PageTurnView, Toolkit::Control, Create );
-DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "pageSize", VECTOR2, PAGE_SIZE )
+DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "viewPageSize", VECTOR2, VIEW_PAGE_SIZE )
DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "currentPageId", INTEGER, CURRENT_PAGE_ID )
DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "spineShadow", VECTOR2, SPINE_SHADOW )
actor.SetProperty( propertyCurrentCenter, value );
}
-PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& pageSize )
+PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& viewPageSize )
: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
mPageFactory( &pageFactory ),
- mPageSize( pageSize ),
+ mPageSize( viewPageSize ),
mSpineShadowParameter( DEFAULT_SPINE_SHADOW_PARAMETER ),
mDistanceUpCorner( 0.f ),
mDistanceBottomCorner( 0.f ),
Control::OnStageDisconnection();
}
-void PageTurnView::SetPageSize( const Vector2& pageSize )
+void PageTurnView::SetPageSize( const Vector2& viewPageSize )
{
- mPageSize = pageSize;
+ mPageSize = viewPageSize;
if( mPointLight )
{
switch( index )
{
- case Toolkit::PageTurnView::Property::PAGE_SIZE:
+ case Toolkit::PageTurnView::Property::VIEW_PAGE_SIZE:
{
pageTurnViewImpl.SetPageSize( value.Get<Vector2>() );
break;
switch( index )
{
- case Toolkit::PageTurnView::Property::PAGE_SIZE:
+ case Toolkit::PageTurnView::Property::VIEW_PAGE_SIZE:
{
value = pageTurnViewImpl.GetPageSize();
break;
* Constructor.
* It initializes the PageTurnView members
*/
- PageTurnView( PageFactory& pageFactory, const Vector2& pageSize );
+ PageTurnView( PageFactory& pageFactory, const Vector2& viewPageSize );
/**
* A reference counted object may only be deleted by calling Unreference()
/**
* Set the page size
- * @param[in] pageSize The size of pages
+ * @param[in] viewPageSize The size of pages
*/
- void SetPageSize( const Vector2& pageSize );
+ void SetPageSize( const Vector2& viewPageSize );
/**
* Retrieve the page size.
// EXTERNAL INCLUDES
#include <dali/integration-api/debug.h>
#include <dali/devel-api/adaptor-framework/image-loading.h>
-#include <dali/devel-api/adaptor-framework/file-loader.h>
+#include <dali/devel-api/adaptor-framework/file-stream.h>
namespace Dali
{
template <typename T>
bool ReadBinFile( Vector<T> &dataBuffer, std::string url, int32_t offset, int32_t count )
{
- std::streampos bufferSize = 0;
- Dali::Vector<char> fileBuffer;
- if( !Dali::FileLoader::ReadFile( url, bufferSize, fileBuffer, FileLoader::FileType::BINARY ) )
+ Dali::FileStream fileStream( url, FileStream::READ || FileStream::BINARY );
+ FILE* fp = fileStream.GetFile();
+ if( !fp )
{
return false;
}
- FILE* fp = fmemopen( &fileBuffer[0], bufferSize, "rb" );
dataBuffer.Resize( count );
ssize_t result = -1;
if( !fseek( fp, offset, SEEK_SET ) )
{
result = fread( &dataBuffer[0], sizeof( T ), count, fp );
}
- fclose( fp );
return ( result >= 0 );
}
// Note: A further 1.0f is subtracted to handle a compensation that happens later within the flick handling code in SnapWithVelocity().
// When a flick is completed, an adjustment of 1.0f is sometimes made to allow for the scenario where:
// A flick finishes before the update thread has advanced the scroll position past the previous snap point.
- Vector2 pageSizeLimit( size.x - ( 1.0f + 1.0f ), size.y - ( 1.0f - 1.0f ) );
- Vector2 minPosition( mStartPosition.x - pageSizeLimit.x, mStartPosition.y - pageSizeLimit.y );
- Vector2 maxPosition( mStartPosition.x + pageSizeLimit.x, mStartPosition.y + pageSizeLimit.y );
+ Vector2 viewPageSizeLimit( size.x - ( 1.0f + 1.0f ), size.y - ( 1.0f - 1.0f ) );
+ Vector2 minPosition( mStartPosition.x - viewPageSizeLimit.x, mStartPosition.y - viewPageSizeLimit.y );
+ Vector2 maxPosition( mStartPosition.x + viewPageSizeLimit.x, mStartPosition.y + viewPageSizeLimit.y );
if( mFixedRulerX )
{
namespace Internal
{
-ScrollViewPagePathEffect::ScrollViewPagePathEffect(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& pageSize, unsigned int pageCount)
-:mPageSize(pageSize),
+ScrollViewPagePathEffect::ScrollViewPagePathEffect(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& viewPageSize, unsigned int pageCount)
+:mPageSize(viewPageSize),
mInputPropertyIndex(inputPropertyIndex),
mPageCount(pageCount)
{
* @param[in] path Pages will follow this path
* @param[in] forward Vector in page local space which will be aligned with tangent of the path
* @param[in] inputPropertyIndex index of the property in the scrollview used to drivce the path
- * @param[in] pageSize size of a page in the scrollview
+ * @param[in] viewPageSize size of a page in the scrollview
* @param[in] pageCount total number of pages in the scrollview
*/
- ScrollViewPagePathEffect(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& pageSize, unsigned int pageCount );
+ ScrollViewPagePathEffect(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& viewPageSize, unsigned int pageCount );
public:
Vector2 contentSize( size.x - ( padding.start + padding.end ), size.y - ( padding.top + padding.bottom ) );
- // If the same text comes for relayouting for same layout size we don't need to calculate point size again.
- // Like for color change.
- if (mController->IsTextFitEnabled() && (mController->GetTextFitContentSize() != contentSize ) )
+ if( mController->IsTextFitEnabled() )
{
- mController->FitPointSizeforLayout(contentSize);
- mController->SetTextFitContentSize(contentSize);
+ mController->FitPointSizeforLayout( contentSize );
+ mController->SetTextFitContentSize( contentSize );
}
// Support Right-To-Left
#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
// EXTERNAL INCLUDES
+#if defined(__GLIBC__)
#include <libintl.h>
+#endif
#include <string.h>
#include <cfloat>
#include <dali/public-api/animation/animation.h>
namespace
{
-
+#if defined(__GLIBC__)
#define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string)
+#endif
const std::string TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME( "TextSelectionPopupButton" );
const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0.8f, 1.0f ) );
// Whether to mirror the list of buttons (for right to left languages)
bool mirror = false;
+#if defined(__GLIBC__)
char* idsLtr = GET_LOCALE_TEXT( IDS_LTR.c_str() );
if( NULL != idsLtr )
{
std::reverse( mOrderListOfButtons.begin(), mOrderListOfButtons.end() );
}
}
+#endif
// Iterate list of buttons and add active ones to Toolbar
std::size_t numberOfOptionsRequired = GetNumberOfEnabledOptions();
#include "atlas-packer.h"
// EXTERNAL HEADER
-#include <stdlib.h> // For abs()
+#include <cstdlib> // For abs()
#include <dali/integration-api/debug.h>
namespace Dali
bool ApproximatelyEqual( uint32_t a, uint32_t b )
{
- return abs( a-b ) <= 1;
+ return std::abs( static_cast<int32_t>( a - b ) ) <= 1;
}
uint16_t MaxDimension( const Uint16Pair& dimensions )
// EXTERNAL INCLUDES
#include <limits>
+#include <cmath>
#include <dali/integration-api/debug.h>
#include <dali/devel-api/text-abstraction/font-client.h>
const GlyphInfo& glyph = *( glyphsBuffer + i );
Vector2& position = *( glyphPositionsBuffer + i );
- position.x = std::round( penX + glyph.xBearing );
+ position.x = std::roundf( penX + glyph.xBearing );
position.y = -glyph.yBearing;
penX += ( glyph.advance + interGlyphExtraAdvance );
// EXTERNAL INCLUDES
#include <limits>
+#include <cmath>
#include <memory.h>
#include <dali/public-api/adaptor-framework/key.h>
#include <dali/integration-api/debug.h>
bool Controller::SetDefaultLineSpacing( float lineSpacing )
{
- if( std::abs(lineSpacing - mImpl->mLayoutEngine.GetDefaultLineSpacing()) > Math::MACHINE_EPSILON_1000 )
+ if( std::fabs( lineSpacing - mImpl->mLayoutEngine.GetDefaultLineSpacing() ) > Math::MACHINE_EPSILON_1000 )
{
mImpl->mLayoutEngine.SetDefaultLineSpacing(lineSpacing);
mImpl->mRecalculateNaturalSize = true;
void Controller::FitPointSizeforLayout( Size layoutSize )
{
+ const OperationsMask operations = mImpl->mOperationsPending;
+ if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) )
+ {
bool actualellipsis = mImpl->mModel->mElideEnabled;
float minPointSize = mImpl->mTextFitMinSize;
float maxPointSize = mImpl->mTextFitMaxSize;
mImpl->mFontDefaults->mFitPointSize = pointSizeArray[bestSizeIndex];
mImpl->mFontDefaults->sizeDefined = true;
ClearFontData();
+ }
}
float Controller::GetHeightForWidth( float width )
namespace Toolkit
{
-ScrollViewPagePathEffect ScrollViewPagePathEffect::New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& pageSize, unsigned int pageCount)
+ScrollViewPagePathEffect ScrollViewPagePathEffect::New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& viewPageSize, unsigned int pageCount)
{
- return ScrollViewPagePathEffect(new Internal::ScrollViewPagePathEffect(path, forward, inputPropertyIndex, pageSize,pageCount));
+ return ScrollViewPagePathEffect(new Internal::ScrollViewPagePathEffect(path, forward, inputPropertyIndex, viewPageSize,pageCount));
}
ScrollViewPagePathEffect::ScrollViewPagePathEffect()
* @param[in] path The path that will be used by the scroll effect
* @param[in] forward Vector in page object space which will be aligned with the tangent of the path
* @param[in] inputPropertyIndex Index of a property of the scroll-view which will be used as the input for the path
- * @param[in] pageSize Size of a page in the scrollview
+ * @param[in] viewPageSize Size of a page in the scrollview
* @param[in] pageCount Total number of pages in the scrollview
* @return A handle to a newly allocated Dali resource
*/
- static ScrollViewPagePathEffect New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& pageSize, unsigned int pageCount);
+ static ScrollViewPagePathEffect New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& viewPageSize, unsigned int pageCount);
/**
* @brief Creates an uninitialized ScrollViewPagePathEffect; this can be initialized with ScrollViewPagePathEffect::New().
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
const unsigned int TOOLKIT_MINOR_VERSION = 4;
-const unsigned int TOOLKIT_MICRO_VERSION = 27;
+const unsigned int TOOLKIT_MICRO_VERSION = 28;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
$(third_party_src_dir)/nanosvg/nanosvg.cc \
$(third_party_src_dir)/nanosvg/nanosvgrast.cc \
$(third_party_src_dir)/yoga/Utils.cpp \
- $(third_party_src_dir)/yoga/YGConfig.cpp \
+ $(third_party_src_dir)/yoga/YGConfig.cpp \
$(third_party_src_dir)/yoga/YGEnums.cpp \
$(third_party_src_dir)/yoga/YGFloatOptional.cpp \
$(third_party_src_dir)/yoga/YGLayout.cpp \
Name: dali-toolkit
Summary: Dali 3D engine Toolkit
-Version: 1.4.27
+Version: 1.4.28
Release: 1
Group: System/Libraries
License: Apache-2.0 and BSD-3-Clause and MIT