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
[dali_2.3.25] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
navigation-view
/
navigation-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
index
5ddf48c
..
f140e3e
100644
(file)
--- a/
dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
17
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,31
+22,28
@@
#include <dali/public-api/object/type-registry-helper.h>
// INTERNAL INCLUDES
#include <dali/public-api/object/type-registry-helper.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
namespace // to register type
{
namespace // to register type
{
-
BaseHandle Create()
{
return Toolkit::NavigationView::New();
}
BaseHandle Create()
{
return Toolkit::NavigationView::New();
}
-DALI_TYPE_REGISTRATION_BEGIN(
Toolkit::NavigationView, Toolkit::Control, Create
)
+DALI_TYPE_REGISTRATION_BEGIN(
Toolkit::NavigationView, Toolkit::Control, Create
)
DALI_TYPE_REGISTRATION_END()
} // namespace
NavigationView::NavigationView()
DALI_TYPE_REGISTRATION_END()
} // namespace
NavigationView::NavigationView()
-: Control(ControlBehaviour(
CONTROL_BEHAVIOUR_DEFAULT )
)
+: Control(ControlBehaviour(
CONTROL_BEHAVIOUR_DEFAULT)
)
{
}
{
}
@@
-59,10
+56,10
@@
NavigationView::~NavigationView()
Toolkit::NavigationView NavigationView::New()
{
// Create the implementation, temporarily owned by this handle on stack
Toolkit::NavigationView NavigationView::New()
{
// Create the implementation, temporarily owned by this handle on stack
- IntrusivePtr<
NavigationView
> internalNavigationView = new NavigationView();
+ IntrusivePtr<
NavigationView
> internalNavigationView = new NavigationView();
// Pass ownership to CustomActor handle
// Pass ownership to CustomActor handle
- Toolkit::NavigationView navigationView(
*internalNavigationView
);
+ Toolkit::NavigationView navigationView(
*internalNavigationView
);
// Second-phase init of the implementation
// This can only be done after the CustomActor connection has been made...
// Second-phase init of the implementation
// This can only be done after the CustomActor connection has been made...
@@
-71,25
+68,30
@@
Toolkit::NavigationView NavigationView::New()
return navigationView;
}
return navigationView;
}
-void NavigationView::On
StageConnection( int depth
)
+void NavigationView::On
Initialize(
)
{
{
- Self().SetSensitive(true);
+ Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER);
+}
+
+void NavigationView::OnSceneConnection(int depth)
+{
+ Self().SetProperty(Actor::Property::SENSITIVE, true);
- Control::OnS
tageConnection( depth
);
+ Control::OnS
ceneConnection(depth
);
}
}
-void NavigationView::Push(
Actor& actor
)
+void NavigationView::Push(
Actor& actor
)
{
// check the uninitialized item
// check the duplicated push for the top item
{
// check the uninitialized item
// check the duplicated push for the top item
- if(!actor
)
+ if(!actor)
{
return;
}
{
return;
}
- if(
mContentStack.size() > 0
)
+ if(
mContentStack.size() > 0
)
{
{
- Self().Remove(
mContentStack.back()
);
+ Self().Remove(
mContentStack.back()
);
}
//push the new item into the stack and show it
}
//push the new item into the stack and show it
@@
-101,7
+103,7
@@
Actor NavigationView::Pop()
{
// cannot pop out the bottom-most item
Actor poppedItem;
{
// cannot pop out the bottom-most item
Actor poppedItem;
- if(
mContentStack.size() > 1
)
+ if(
mContentStack.size() > 1
)
{
// pop out the top item of the stack and show the new item right under the old one.
Self().Remove(mContentStack.back());
{
// pop out the top item of the stack and show the new item right under the old one.
Self().Remove(mContentStack.back());