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] Fix role setting
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
table-view
/
table-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index
9a85dce
..
4f27bba
100755
(executable)
--- a/
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@
-28,6
+28,9
@@
#include <dali/public-api/size-negotiation/relayout-container.h>
#include <dali/integration-api/debug.h>
#include <dali/public-api/size-negotiation/relayout-container.h>
#include <dali/integration-api/debug.h>
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+
using namespace Dali;
namespace
using namespace Dali;
namespace
@@
-829,14
+832,13
@@
void TableView::OnRelayout( const Vector2& size, RelayoutContainer& container )
if( actor && position.rowIndex == row && position.columnIndex == column )
{
// Anchor actor to top left of the cell
if( actor && position.rowIndex == row && position.columnIndex == column )
{
// Anchor actor to top left of the cell
- if( actor.GetProperty(
Devel
Actor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >() )
+ if( actor.GetProperty( Actor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >() )
{
actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
}
actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
{
actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
}
actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
- Padding padding;
- actor.GetPadding( padding );
+ Padding padding = actor.GetProperty<Vector4>( Actor::Property::PADDING );
float left = (column > 0) ? mColumnData[column - 1].position : 0.f;
float right;
float left = (column > 0) ? mColumnData[column - 1].position : 0.f;
float right;
@@
-856,28
+858,28
@@
void TableView::OnRelayout( const Vector2& size, RelayoutContainer& container )
if( cellData.horizontalAlignment == HorizontalAlignment::LEFT )
{
if( cellData.horizontalAlignment == HorizontalAlignment::LEFT )
{
- actor.Set
X(
left + mPadding.width + padding.left );
+ actor.Set
Property( Actor::Property::POSITION_X,
left + mPadding.width + padding.left );
}
else if( cellData.horizontalAlignment == HorizontalAlignment::RIGHT )
{
}
else if( cellData.horizontalAlignment == HorizontalAlignment::RIGHT )
{
- actor.Set
X(
right - mPadding.width - padding.right - actor.GetRelayoutSize( Dimension::WIDTH ) );
+ actor.Set
Property( Actor::Property::POSITION_X,
right - mPadding.width - padding.right - actor.GetRelayoutSize( Dimension::WIDTH ) );
}
else //if( cellData.horizontalAlignment == HorizontalAlignment::CENTER )
{
}
else //if( cellData.horizontalAlignment == HorizontalAlignment::CENTER )
{
- actor.Set
X(
(left + right + padding.left - padding.right - actor.GetRelayoutSize( Dimension::WIDTH )) * 0.5f );
+ actor.Set
Property( Actor::Property::POSITION_X,
(left + right + padding.left - padding.right - actor.GetRelayoutSize( Dimension::WIDTH )) * 0.5f );
}
if( cellData.verticalAlignment == VerticalAlignment::TOP )
{
}
if( cellData.verticalAlignment == VerticalAlignment::TOP )
{
- actor.Set
Y(
top + mPadding.height + padding.top );
+ actor.Set
Property( Actor::Property::POSITION_Y,
top + mPadding.height + padding.top );
}
else if( cellData.verticalAlignment == VerticalAlignment::BOTTOM )
{
}
else if( cellData.verticalAlignment == VerticalAlignment::BOTTOM )
{
- actor.Set
Y(
bottom - mPadding.height - padding.bottom - actor.GetRelayoutSize( Dimension::HEIGHT ) );
+ actor.Set
Property( Actor::Property::POSITION_Y,
bottom - mPadding.height - padding.bottom - actor.GetRelayoutSize( Dimension::HEIGHT ) );
}
else //if( cellData.verticalAlignment = VerticalAlignment::CENTER )
{
}
else //if( cellData.verticalAlignment = VerticalAlignment::CENTER )
{
- actor.Set
Y(
(top + bottom + padding.top - padding.bottom - actor.GetRelayoutSize( Dimension::HEIGHT )) * 0.5f );
+ actor.Set
Property( Actor::Property::POSITION_Y,
(top + bottom + padding.top - padding.bottom - actor.GetRelayoutSize( Dimension::HEIGHT )) * 0.5f );
}
}
}
}
}
}
@@
-1118,8
+1120,13
@@
void TableView::OnInitialize()
{
// Make self as keyboard focusable and focus group
Actor self = Self();
{
// Make self as keyboard focusable and focus group
Actor self = Self();
- self.Set
KeyboardFocusable(
true);
+ self.Set
Property( Actor::Property::KEYBOARD_FOCUSABLE,
true);
SetAsKeyboardFocusGroup(true);
SetAsKeyboardFocusGroup(true);
+
+ DevelControl::SetAccessibilityConstructor( self, []( Dali::Actor actor ) {
+ return std::unique_ptr< Dali::Accessibility::Accessible >(
+ new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::TABLE ) );
+ } );
}
void TableView::ResizeContainers( unsigned int rows, unsigned int columns )
}
void TableView::ResizeContainers( unsigned int rows, unsigned int columns )
@@
-1213,7
+1220,7
@@
void TableView::SetHeightOrWidthProperty(TableView& tableViewImpl,
void(TableView::*funcFit)(unsigned int),
const Property::Value& value )
{
void(TableView::*funcFit)(unsigned int),
const Property::Value& value )
{
- Property::Map* map = value.GetMap();
+
const
Property::Map* map = value.GetMap();
if( map )
{
unsigned int index(0);
if( map )
{
unsigned int index(0);