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
/
flex-container
/
flex-container-impl.cpp
diff --git
a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
index
98d801b
..
9749407
100755
(executable)
--- a/
dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
+++ b/
dali-toolkit/internal/controls/flex-container/flex-container-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
@@
-515,7
+518,7
@@
void FlexContainer::OnRelayout( const Vector2& size, RelayoutContainer& containe
if( child )
{
// Anchor actor to top left of the container
if( child )
{
// Anchor actor to top left of the container
- if( child.GetProperty(
Devel
Actor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >() )
+ if( child.GetProperty( Actor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >() )
{
child.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
}
{
child.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
}
@@
-704,8
+707,8
@@
void FlexContainer::RelayoutChildren()
Dali::Actor child = mChildrenNodes[i].actor.GetHandle();
if( child )
{
Dali::Actor child = mChildrenNodes[i].actor.GetHandle();
if( child )
{
- child.Set
X(
YGNodeLayoutGetLeft( mChildrenNodes[i].node ) );
- child.Set
Y(
YGNodeLayoutGetTop( mChildrenNodes[i].node ) );
+ child.Set
Property( Actor::Property::POSITION_X,
YGNodeLayoutGetLeft( mChildrenNodes[i].node ) );
+ child.Set
Property( Actor::Property::POSITION_Y,
YGNodeLayoutGetTop( mChildrenNodes[i].node ) );
}
}
}
}
}
}
@@
-760,7
+763,7
@@
Actor FlexContainer::GetNextKeyboardFocusableActor(Actor currentFocusedActor, To
{
break;
}
{
break;
}
- } while ( !mChildrenNodes[nextFocusedActorIndex].actor.GetHandle().
IsKeyboardFocusable(
) );
+ } while ( !mChildrenNodes[nextFocusedActorIndex].actor.GetHandle().
GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE
) );
break;
}
case Toolkit::Control::KeyboardFocus::RIGHT:
break;
}
case Toolkit::Control::KeyboardFocus::RIGHT:
@@
-782,7
+785,7
@@
Actor FlexContainer::GetNextKeyboardFocusableActor(Actor currentFocusedActor, To
{
break;
}
{
break;
}
- } while ( !mChildrenNodes[nextFocusedActorIndex].actor.GetHandle().
IsKeyboardFocusable(
) );
+ } while ( !mChildrenNodes[nextFocusedActorIndex].actor.GetHandle().
GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE
) );
break;
}
default:
break;
}
default:
@@
-822,6
+825,10
@@
FlexContainer::FlexContainer()
mAlignContent( Toolkit::FlexContainer::ALIGN_FLEX_START )
{
SetKeyboardNavigationSupport( true );
mAlignContent( Toolkit::FlexContainer::ALIGN_FLEX_START )
{
SetKeyboardNavigationSupport( true );
+ DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
+ return std::unique_ptr< Dali::Accessibility::Accessible >(
+ new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::FILLER ) );
+ } );
}
void FlexContainer::OnInitialize()
}
void FlexContainer::OnInitialize()
@@
-842,7
+849,7
@@
void FlexContainer::OnInitialize()
YGNodeStyleSetAlignContent( mRootNode.node, static_cast<YGAlign>( mAlignContent ) );
// Make self as keyboard focusable and focus group
YGNodeStyleSetAlignContent( mRootNode.node, static_cast<YGAlign>( mAlignContent ) );
// Make self as keyboard focusable and focus group
- self.Set
KeyboardFocusable(
true );
+ self.Set
Property( Actor::Property::KEYBOARD_FOCUSABLE,
true );
SetAsKeyboardFocusGroup( true );
}
SetAsKeyboardFocusGroup( true );
}