projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AT-SPI] Squashed implementation
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
alignment
/
alignment-impl.cpp
diff --git
a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index
07186e0
..
a58f78f
100644
(file)
--- a/
dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/
dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@
-24,6
+24,9
@@
#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/size-negotiation/relayout-container.h>
#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/size-negotiation/relayout-container.h>
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+
namespace Dali
{
namespace Dali
{
@@
-59,17
+62,17
@@
inline Vector3 GetPosition( const Toolkit::Alignment::Padding& padding, Toolkit:
switch( horizontalAlignment )
{
switch( horizontalAlignment )
{
- case Dali::Toolkit::Alignment::H
orizontalLeft
:
+ case Dali::Toolkit::Alignment::H
ORIZONTAL_LEFT
:
{
position.x += padding.left;
break;
}
{
position.x += padding.left;
break;
}
- case Dali::Toolkit::Alignment::H
orizontalRight
:
+ case Dali::Toolkit::Alignment::H
ORIZONTAL_RIGHT
:
{
position.x -= padding.right;
break;
}
{
position.x -= padding.right;
break;
}
- case Dali::Toolkit::Alignment::H
orizontalCenter
: // FALLTHROUGH
+ case Dali::Toolkit::Alignment::H
ORIZONTAL_CENTER
: // FALLTHROUGH
default: // use center as default
{
if( currentSize.width + padding.left + padding.right >= parentSize.width )
default: // use center as default
{
if( currentSize.width + padding.left + padding.right >= parentSize.width )
@@
-82,17
+85,17
@@
inline Vector3 GetPosition( const Toolkit::Alignment::Padding& padding, Toolkit:
switch( verticalAlignment )
{
switch( verticalAlignment )
{
- case Dali::Toolkit::Alignment::V
erticalTop
:
+ case Dali::Toolkit::Alignment::V
ERTICAL_TOP
:
{
position.y += padding.top;
break;
}
{
position.y += padding.top;
break;
}
- case Dali::Toolkit::Alignment::V
erticalBottom
:
+ case Dali::Toolkit::Alignment::V
ERTICAL_BOTTOM
:
{
position.y -= padding.bottom;
break;
}
{
position.y -= padding.bottom;
break;
}
- case Dali::Toolkit::Alignment::V
erticalCenter
: // FALLTHROUGH
+ case Dali::Toolkit::Alignment::V
ERTICAL_CENTER
: // FALLTHROUGH
default: // use center as default
{
if( currentSize.height + padding.top + padding.bottom >= parentSize.height )
default: // use center as default
{
if( currentSize.height + padding.top + padding.bottom >= parentSize.height )
@@
-126,31
+129,31
@@
Toolkit::Alignment Alignment::New( Toolkit::Alignment::Type horizontal, Toolkit:
void Alignment::SetAlignmentType( Toolkit::Alignment::Type type )
{
// Horizontal Alignment
void Alignment::SetAlignmentType( Toolkit::Alignment::Type type )
{
// Horizontal Alignment
- if( type & Toolkit::Alignment::H
orizontalRight
)
+ if( type & Toolkit::Alignment::H
ORIZONTAL_RIGHT
)
{
{
- mHorizontal = Toolkit::Alignment::H
orizontalRight
;
+ mHorizontal = Toolkit::Alignment::H
ORIZONTAL_RIGHT
;
}
}
- if( type & Toolkit::Alignment::H
orizontalLeft
)
+ if( type & Toolkit::Alignment::H
ORIZONTAL_LEFT
)
{
{
- mHorizontal = Toolkit::Alignment::H
orizontalLeft
;
+ mHorizontal = Toolkit::Alignment::H
ORIZONTAL_LEFT
;
}
}
- if( type & Toolkit::Alignment::H
orizontalCenter
)
+ if( type & Toolkit::Alignment::H
ORIZONTAL_CENTER
)
{
{
- mHorizontal = Toolkit::Alignment::H
orizontalCenter
;
+ mHorizontal = Toolkit::Alignment::H
ORIZONTAL_CENTER
;
}
// Vertical Alignment
}
// Vertical Alignment
- if( type & Toolkit::Alignment::V
erticalBottom
)
+ if( type & Toolkit::Alignment::V
ERTICAL_BOTTOM
)
{
{
- mVertical = Toolkit::Alignment::V
erticalBottom
;
+ mVertical = Toolkit::Alignment::V
ERTICAL_BOTTOM
;
}
}
- if( type & Toolkit::Alignment::V
erticalTop
)
+ if( type & Toolkit::Alignment::V
ERTICAL_TOP
)
{
{
- mVertical = Toolkit::Alignment::V
erticalTop
;
+ mVertical = Toolkit::Alignment::V
ERTICAL_TOP
;
}
}
- if( type & Toolkit::Alignment::V
erticalCenter
)
+ if( type & Toolkit::Alignment::V
ERTICAL_CENTER
)
{
{
- mVertical = Toolkit::Alignment::V
erticalCenter
;
+ mVertical = Toolkit::Alignment::V
ERTICAL_CENTER
;
}
RelayoutRequest();
}
RelayoutRequest();
@@
-192,21
+195,21
@@
void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container )
// lay out the actors
Vector3 anchorPointAndParentOrigin = Vector3::ZERO;
anchorPointAndParentOrigin.z = 0.5f;
// lay out the actors
Vector3 anchorPointAndParentOrigin = Vector3::ZERO;
anchorPointAndParentOrigin.z = 0.5f;
- // anchorPoint.x is initialized to 0.0, which is H
orizontalLeft
- if( Toolkit::Alignment::H
orizontalCenter
== mHorizontal )
+ // anchorPoint.x is initialized to 0.0, which is H
ORIZONTAL_LEFT
+ if( Toolkit::Alignment::H
ORIZONTAL_CENTER
== mHorizontal )
{
anchorPointAndParentOrigin.x = 0.5f;
}
{
anchorPointAndParentOrigin.x = 0.5f;
}
- else if( Toolkit::Alignment::H
orizontalRight
== mHorizontal )
+ else if( Toolkit::Alignment::H
ORIZONTAL_RIGHT
== mHorizontal )
{
anchorPointAndParentOrigin.x = 1.0f;
}
{
anchorPointAndParentOrigin.x = 1.0f;
}
- // anchorPoint.y is initialized to 0.0, which is V
erticalTop
- if( Toolkit::Alignment::V
erticalCenter
== mVertical )
+ // anchorPoint.y is initialized to 0.0, which is V
ERTICAL_TOP
+ if( Toolkit::Alignment::V
ERTICAL_CENTER
== mVertical )
{
anchorPointAndParentOrigin.y = 0.5f;
}
{
anchorPointAndParentOrigin.y = 0.5f;
}
- else if( Toolkit::Alignment::V
erticalBottom
== mVertical )
+ else if( Toolkit::Alignment::V
ERTICAL_BOTTOM
== mVertical )
{
anchorPointAndParentOrigin.y = 1.0f;
}
{
anchorPointAndParentOrigin.y = 1.0f;
}
@@
-236,33
+239,33
@@
void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container )
// no point trying to squeeze actors into too small size
switch( mScaling )
{
// no point trying to squeeze actors into too small size
switch( mScaling )
{
- case Toolkit::Alignment::S
caleNone
:
+ case Toolkit::Alignment::S
CALE_NONE
:
{
// Nothing to do
renegotiate = false;
break;
}
{
// Nothing to do
renegotiate = false;
break;
}
- case Toolkit::Alignment::S
caleToFill
:
+ case Toolkit::Alignment::S
CALE_TO_FILL
:
{
// Nothing to do, newChildSize is already full size minus padding
break;
}
{
// Nothing to do, newChildSize is already full size minus padding
break;
}
- case Toolkit::Alignment::S
caleToFitKeepAspect
:
+ case Toolkit::Alignment::S
CALE_TO_FIT_KEEP_ASPECT
:
{
newChildSize = currentChildSize * std::min( ( newChildSize.width / currentChildSize.width ), ( newChildSize.height / currentChildSize.height ) );
break;
}
{
newChildSize = currentChildSize * std::min( ( newChildSize.width / currentChildSize.width ), ( newChildSize.height / currentChildSize.height ) );
break;
}
- case Toolkit::Alignment::S
caleToFillKeepAspect
:
+ case Toolkit::Alignment::S
CALE_TO_FILL_KEEP_ASPECT
:
{
newChildSize = currentChildSize * std::max( ( newChildSize.width / currentChildSize.width ), ( newChildSize.height / currentChildSize.height ) );
break;
}
{
newChildSize = currentChildSize * std::max( ( newChildSize.width / currentChildSize.width ), ( newChildSize.height / currentChildSize.height ) );
break;
}
- case Toolkit::Alignment::S
hrinkToFit
:
+ case Toolkit::Alignment::S
HRINK_TO_FIT
:
{
newChildSize = Vector2( std::min( newChildSize.width, currentChildSize.width ), std::min( newChildSize.height, currentChildSize.height ) );
break;
}
{
newChildSize = Vector2( std::min( newChildSize.width, currentChildSize.width ), std::min( newChildSize.height, currentChildSize.height ) );
break;
}
- case Toolkit::Alignment::S
hrinkToFitKeepAspect
:
+ case Toolkit::Alignment::S
HRINK_TO_FIT_KEEP_ASPECT
:
{
// check source size vs target size to see if we need to shrink
float widthScale = ( newChildSize.width < currentChildSize.width ) ? (newChildSize.width / currentChildSize.width) : 1.f;
{
// check source size vs target size to see if we need to shrink
float widthScale = ( newChildSize.width < currentChildSize.width ) ? (newChildSize.width / currentChildSize.width) : 1.f;
@@
-280,7
+283,7
@@
void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container )
}
}
}
}
- child.SetP
osition(
GetPosition( mPadding, mHorizontal, mVertical , newChildSize, currentChildSize ) );
+ child.SetP
roperty( Actor::Property::POSITION,
GetPosition( mPadding, mHorizontal, mVertical , newChildSize, currentChildSize ) );
if( renegotiate )
{
if( renegotiate )
{
@@
-293,9
+296,13
@@
Alignment::Alignment( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::T
: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
mHorizontal( horizontal ),
mVertical( vertical ),
: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
mHorizontal( horizontal ),
mVertical( vertical ),
- mScaling( Toolkit::Alignment::S
caleNone
),
+ mScaling( Toolkit::Alignment::S
CALE_NONE
),
mPadding( 0.f, 0.f, 0.f, 0.f )
{
mPadding( 0.f, 0.f, 0.f, 0.f )
{
+ DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
+ return std::unique_ptr< Dali::Accessibility::Accessible >(
+ new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::FILLER ) );
+ } );
}
Alignment::~Alignment()
}
Alignment::~Alignment()