From: Paul Wisbey
Date: Thu, 9 Apr 2015 16:55:24 +0000 (+0100)
Subject: Merge branch 'new_text' into tizen
X-Git-Tag: dali_1.0.38~11
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7aa9e3d716396348b89c913b306bbc1ce201db69;hp=c25b3c40178dadf12dc5e8f77c17413df0a55099
Merge branch 'new_text' into tizen
Change-Id: Iecbf9000e282e0eda6240c4895f9d25a1bbb6c41
---
diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp
index 202e944..be1993c 100644
--- a/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/dali-toolkit/internal/builder/builder-impl.cpp
@@ -534,9 +534,6 @@ BaseHandle Builder::DoCreate( const TreeNode& root, const TreeNode& node,
if( actor )
{
- // TEMP: Assume all script created actors are not using size negotiation for now
- actor.SetRelayoutEnabled( false );
-
// add children of all the styles
if( OptionalChild actors = IsChild( node, KEYNAME_ACTORS ) )
{
diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
index 4ca5be5..239d94e 100644
--- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
@@ -138,7 +138,7 @@ GaussianBlurView::GaussianBlurView()
GaussianBlurView::GaussianBlurView( const unsigned int numSamples, const float blurBellCurveWidth, const Pixel::Format renderTargetPixelFormat,
const float downsampleWidthScale, const float downsampleHeightScale,
bool blurUserImage)
- : Control( CONTROL_BEHAVIOUR_NONE )
+ : Control( NO_SIZE_NEGOTIATION )
, mNumSamples(numSamples)
, mBlurBellCurveWidth( 0.001f )
, mPixelFormat(renderTargetPixelFormat)
@@ -266,12 +266,14 @@ void GaussianBlurView::OnInitialize()
// Create an ImageActor for performing a horizontal blur on the texture
mImageActorHorizBlur = ImageActor::New();
+ mImageActorHorizBlur.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
mImageActorHorizBlur.SetParentOrigin(ParentOrigin::CENTER);
mImageActorHorizBlur.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
mImageActorHorizBlur.SetShaderEffect( mHorizBlurShader );
// Create an ImageActor for performing a vertical blur on the texture
mImageActorVertBlur = ImageActor::New();
+ mImageActorVertBlur.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
mImageActorVertBlur.SetParentOrigin(ParentOrigin::CENTER);
mImageActorVertBlur.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
mImageActorVertBlur.SetShaderEffect( mVertBlurShader );
@@ -283,6 +285,7 @@ void GaussianBlurView::OnInitialize()
if(!mBlurUserImage)
{
mImageActorComposite = ImageActor::New();
+ mImageActorComposite.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
mImageActorComposite.SetParentOrigin(ParentOrigin::CENTER);
mImageActorComposite.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
mImageActorComposite.SetOpacity(GAUSSIAN_BLUR_VIEW_DEFAULT_BLUR_STRENGTH); // ensure alpha is enabled for this object and set default value
@@ -293,6 +296,7 @@ void GaussianBlurView::OnInitialize()
// Create an ImageActor for holding final result, i.e. the blurred image. This will get rendered to screen later, via default / user render task
mTargetActor = ImageActor::New();
+ mTargetActor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
mTargetActor.SetParentOrigin(ParentOrigin::CENTER);
mTargetActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index 384e291..624e973 100644
--- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -143,6 +143,7 @@ void SuperBlurView::OnInitialize()
for(unsigned int i=0; i<=mBlurLevels;i++)
{
mImageActors[i] = ImageActor::New( );
+ mImageActors[i].SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
mImageActors[i].SetParentOrigin( ParentOrigin::CENTER );
mImageActors[i].SetZ(-static_cast(i)*0.01f);
mImageActors[i].SetColorMode( USE_OWN_MULTIPLY_PARENT_ALPHA );
@@ -251,16 +252,6 @@ void SuperBlurView::ClearBlurResource()
}
}
-void SuperBlurView::OnRelayout( const Vector2& size, RelayoutContainer& container )
-{
- unsigned int numChildren = Self().GetChildCount();
-
- for( unsigned int i=0; i& array )
{
Dali::Toolkit::Internal::TableView::CellData data = array[i][j];
char actor = ' ';
+ std::string actorName;
if( data.actor )
{
actor = 'A';
+ actorName = data.actor.GetName();
}
- TV_LOG("Array[%d,%d]=%c %d,%d,%d,%d ", i, j, actor,
+ TV_LOG("Array[%d,%d]=%c %s %d,%d,%d,%d ", i, j, actor, actorName.c_str(),
data.position.rowIndex, data.position.columnIndex,
data.position.rowSpan, data.position.columnSpan );
}
@@ -192,50 +194,33 @@ bool TableView::AddChild( Actor& child, const Toolkit::TableView::CellPosition&
// adopt the child
Self().Add( child );
- // put the actor to the main cell
- CellData& data = mCellData[ position.rowIndex ][ position.columnIndex ];
- data.actor = child;
- data.position = position;
-
// if child spans multiple rows of columns
- bool spanned = false;
- if( position.rowSpan > 1 )
+ if( ( position.rowSpan > 1 ) && ( position.rowIndex + position.rowSpan > mCellData.GetRows() ) )
{
- // span might go outside table
- if( position.rowIndex + position.rowSpan > mCellData.GetRows() )
- {
- // increase table size for the full span, only increasing rows
- ResizeContainers( position.rowIndex + position.rowSpan, mCellData.GetColumns() );
- }
-
- spanned = true;
+ // increase table size for the full span, only increasing rows
+ ResizeContainers( position.rowIndex + position.rowSpan, mCellData.GetColumns() );
}
- if( position.columnSpan > 1 )
+ if( ( position.columnSpan > 1 ) && ( position.columnIndex + position.columnSpan > mCellData.GetColumns() ) )
{
- // span might go outside table
- if( position.columnIndex + position.columnSpan > mCellData.GetColumns() )
- {
- // increase table size for the full span, only increasing columns
- ResizeContainers( mCellData.GetRows(), position.columnIndex + position.columnSpan );
- }
-
- spanned = true;
+ // increase table size for the full span, only increasing columns
+ ResizeContainers( mCellData.GetRows(), position.columnIndex + position.columnSpan );
}
- // if it spanned multiple rows, put the cellinfo in all of those
- if( spanned )
+ // Fill in all cells that need the data
+ CellData data;
+ data.actor = child;
+ data.position = position;
+
+ for( unsigned int row = position.rowIndex; row < ( position.rowIndex + position.rowSpan ); ++row )
{
- for( unsigned int row = position.rowIndex; row < ( position.rowIndex + position.rowSpan ); ++row )
+ // store same information to all cells, this way we can identify
+ // if a cell is the prime location of an actor or a spanned one
+ for( unsigned int column = position.columnIndex; column < ( position.columnIndex + position.columnSpan ); ++column )
{
// store same information to all cells, this way we can identify
// if a cell is the prime location of an actor or a spanned one
- for( unsigned int column = position.columnIndex; column < ( position.columnIndex + position.columnSpan ); ++column )
- {
- // store same information to all cells, this way we can identify
- // if a cell is the prime location of an actor or a spanned one
- mCellData[ row ][ column ] = data;
- }
+ mCellData[ row ][ column ] = data;
}
}
@@ -1280,6 +1265,7 @@ float TableView::CalculateChildSize( const Actor& child, Dimension dimension )
// Accumulate the width
for( unsigned int i = 0; i < position.columnSpan; ++i )
{
+ DALI_ASSERT_DEBUG( column + i < mColumnData.Size() );
cellSize += mColumnData[ column + i ].size;
}
@@ -1300,6 +1286,7 @@ float TableView::CalculateChildSize( const Actor& child, Dimension dimension )
// Accumulate the height
for( unsigned int i = 0; i < position.rowSpan; ++i )
{
+ DALI_ASSERT_DEBUG( row + i < mRowData.Size() );
cellSize += mRowData[ row + i ].size;
}
diff --git a/dali-toolkit/internal/controls/view/view-impl.cpp b/dali-toolkit/internal/controls/view/view-impl.cpp
index 3cb58ac..24229f3 100644
--- a/dali-toolkit/internal/controls/view/view-impl.cpp
+++ b/dali-toolkit/internal/controls/view/view-impl.cpp
@@ -152,7 +152,8 @@ void View::SetBackground( ImageActor backgroundImage )
}
backgroundImage.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
- backgroundImage.SetRelayoutEnabled( false ); // We will scale its size manually
+ backgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+ backgroundImage.SetSizeScalePolicy( FILL_WITH_ASPECT_RATIO );
mBackgroundLayer.Add( backgroundImage );
RelayoutRequest();
@@ -294,18 +295,6 @@ void View::OnInitialize()
}
}
-void View::OnRelayout( const Vector2& size, RelayoutContainer& container )
-{
- if( mBackgroundLayer )
- {
- if( mBackgroundLayer && mBackgroundLayer.GetChildCount() > 0 )
- {
- Actor background = mBackgroundLayer.GetChildAt(0);
- background.SetScale( FillXYKeepAspectRatio( Vector3( size.width, size.height, 1.0f ), background.GetTargetSize() ) );
- }
- }
-}
-
View::Orientation View::DegreeToViewOrientation( Degree degree )
{
View::Orientation orientation = PORTRAIT;
diff --git a/dali-toolkit/internal/controls/view/view-impl.h b/dali-toolkit/internal/controls/view/view-impl.h
index 9aacc9e..b956eae 100644
--- a/dali-toolkit/internal/controls/view/view-impl.h
+++ b/dali-toolkit/internal/controls/view/view-impl.h
@@ -137,11 +137,6 @@ private: // From Control
*/
virtual void OnInitialize();
- /**
- * @copydoc Toolkit::Control::OnRelayout()
- */
- virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
-
private:
diff --git a/packaging/dali-toolkit-mobile.spec b/packaging/dali-toolkit-mobile.spec
deleted file mode 100644
index 79cadd4..0000000
--- a/packaging/dali-toolkit-mobile.spec
+++ /dev/null
@@ -1,108 +0,0 @@
-Name: dali-toolkit
-Summary: The OpenGLES Canvas Core Library Toolkit
-Version: 1.0.34
-Release: 1
-Group: System/Libraries
-License: Apache-2.0
-URL: https://review.tizen.org/git/?p=platform/core/uifw/dali-toolkit.git;a=summary
-Source0: %{name}-%{version}.tar.gz
-
-%define dali_profile MOBILE
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: dali
-# Do NOT put an adaptor here - it is an application choice which adaptor to use
-BuildRequires: pkgconfig
-BuildRequires: pkgconfig(dlog)
-BuildRequires: boost-devel
-BuildRequires: pkgconfig(dali)
-BuildRequires: pkgconfig(dali-core)
-
-%description
-The OpenGLES Canvas Core Library Toolkit - a set of controls that provide
-user interface functionality.
-
-##############################
-# devel
-##############################
-%package devel
-Summary: Application development package for the OpenGLES Canvas toolkit
-Group: Development/Building
-Requires: %{name} = %{version}-%{release}
-Requires: boost-devel
-
-%description devel
-Application development package for the OpenGLES Canvas toolkit - headers and package config
-
-##############################
-# Preparation
-##############################
-%prep
-%setup -q
-%define dali_data_rw_dir /opt/usr/share/dali/
-%define dali_data_ro_dir /usr/share/dali/
-%define dali_toolkit_image_files %{dali_data_ro_dir}/toolkit/images/
-%define dali_toolkit_sound_files %{dali_data_ro_dir}/toolkit/sounds/
-%define dali_toolkit_style_files %{dali_data_ro_dir}/toolkit/styles/
-%define dev_include_path %{_includedir}
-
-##############################
-# Build
-##############################
-%build
-PREFIX="/usr"
-CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections "
-LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections -Wl,-Bsymbolic-functions "
-
-libtoolize --force
-cd %{_builddir}/dali-toolkit-%{version}/build/tizen
-autoreconf --install
-DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR
-DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
-%configure --enable-profile=%{dali_profile}
-make %{?jobs:-j%jobs}
-
-##############################
-# Installation
-##############################
-%install
-rm -rf %{buildroot}
-cd build/tizen
-%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
-
-# LICENSE
-mkdir -p %{buildroot}/usr/share/license
-cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{name}
-
-##############################
-# Post Install
-##############################
-%post
-/sbin/ldconfig
-exit 0
-
-##############################
-# Post Uninstall
-##############################
-%postun
-/sbin/ldconfig
-exit 0
-
-##############################
-# Files in Binary Packages
-##############################
-%files
-%manifest dali-toolkit.manifest-smack
-%defattr(-,root,root,-)
-%{_libdir}/lib%{name}.so*
-%{dali_toolkit_image_files}/*
-%{dali_toolkit_sound_files}/*
-%{dali_toolkit_style_files}/*
-%{_datadir}/license/%{name}
-
-%files devel
-%defattr(-,root,root,-)
-%{dev_include_path}/%{name}/*
-%{_libdir}/pkgconfig/*.pc
-
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index b0e9668..365d937 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -7,8 +7,6 @@ License: Apache-2.0
URL: https://review.tizen.org/git/?p=platform/core/uifw/dali-toolkit.git;a=summary
Source0: %{name}-%{version}.tar.gz
-%define dali_profile MOBILE
-
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires: dali
@@ -60,7 +58,7 @@ cd %{_builddir}/dali-toolkit-%{version}/build/tizen
autoreconf --install
DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR
DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
-%configure --enable-profile=%{dali_profile}
+%configure
make %{?jobs:-j%jobs}
##############################