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
/
scrollable
/
item-view
/
item-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index
dc329ed
..
19d7373
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@
-333,7
+333,7
@@
Dali::Toolkit::ItemView ItemView::New(ItemFactory& factory)
}
ItemView::ItemView(ItemFactory& factory)
}
ItemView::ItemView(ItemFactory& factory)
-: Scrollable( ControlBehaviour( DISABLE_SIZE_NEGOTIATION | DISABLE_STYLE_CHANGE_SIGNALS | REQUIRES_
WHEEL_EVENTS | REQUIRES_
KEYBOARD_NAVIGATION_SUPPORT ) ),
+: Scrollable( ControlBehaviour( DISABLE_SIZE_NEGOTIATION | DISABLE_STYLE_CHANGE_SIGNALS | REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) ),
mItemFactory(factory),
mItemsParentOrigin(ParentOrigin::CENTER),
mItemsAnchorPoint(AnchorPoint::CENTER),
mItemFactory(factory),
mItemsParentOrigin(ParentOrigin::CENTER),
mItemsAnchorPoint(AnchorPoint::CENTER),
@@
-362,6
+362,8
@@
ItemView::ItemView(ItemFactory& factory)
void ItemView::OnInitialize()
{
void ItemView::OnInitialize()
{
+ Scrollable::OnInitialize();
+
Actor self = Self();
Vector2 stageSize = Stage::GetCurrent().GetSize();
Actor self = Self();
Vector2 stageSize = Stage::GetCurrent().GetSize();
@@
-374,6
+376,9
@@
void ItemView::OnInitialize()
mWheelEventFinishedTimer.TickSignal().Connect( this, &ItemView::OnWheelEventFinished );
SetRefreshInterval(DEFAULT_REFRESH_INTERVAL_LAYOUT_POSITIONS);
mWheelEventFinishedTimer.TickSignal().Connect( this, &ItemView::OnWheelEventFinished );
SetRefreshInterval(DEFAULT_REFRESH_INTERVAL_LAYOUT_POSITIONS);
+
+ // Connect wheel event
+ self.WheelEventSignal().Connect( this, &ItemView::OnWheelEvent );
}
ItemView::~ItemView()
}
ItemView::~ItemView()
@@
-1022,7
+1027,7
@@
void ItemView::OnChildAdd(Actor& child)
Scrollable::OnChildAdd( child );
}
Scrollable::OnChildAdd( child );
}
-bool ItemView::OnWheelEvent(const WheelEvent& event)
+bool ItemView::OnWheelEvent(
Actor actor,
const WheelEvent& event)
{
// Respond the wheel event to scroll
if (mActiveLayout)
{
// Respond the wheel event to scroll
if (mActiveLayout)
@@
-1816,7
+1821,7
@@
void ItemView::SetLayoutArray( const Property::Array& layouts )
{
const Property::Value& element = layouts.GetElementAt( arrayIdx );
{
const Property::Value& element = layouts.GetElementAt( arrayIdx );
- Property::Map* layout = element.GetMap();
+
const
Property::Map* layout = element.GetMap();
if( layout != NULL )
{
for( unsigned int mapIdx = 0, mapCount = (*layout).Count(); mapIdx < mapCount; ++mapIdx )
if( layout != NULL )
{
for( unsigned int mapIdx = 0, mapCount = (*layout).Count(); mapIdx < mapCount; ++mapIdx )