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
Update keyboard focus direction enum for Control
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
popup
/
popup-impl.cpp
diff --git
a/dali-toolkit/internal/controls/popup/popup-impl.cpp
b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index
0a58b7c
..
719cfe9
100755
(executable)
--- a/
dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/
dali-toolkit/internal/controls/popup/popup-impl.cpp
@@
-423,7
+423,7
@@
void Popup::CreateBacking()
mLayer.Add( mBacking );
mBacking.SetOpacity(0.0f);
mBacking.TouchedSignal().Connect( this, &Popup::OnBackingTouched );
mLayer.Add( mBacking );
mBacking.SetOpacity(0.0f);
mBacking.TouchedSignal().Connect( this, &Popup::OnBackingTouched );
- mBacking.
MouseWheelEventSignal().Connect(this, &Popup::OnBackingMouse
WheelEvent);
+ mBacking.
WheelEventSignal().Connect(this, &Popup::OnBacking
WheelEvent);
}
void Popup::CreateDialog()
}
void Popup::CreateDialog()
@@
-611,9
+611,9
@@
bool Popup::OnBackingTouched(Actor actor, const TouchEvent& event)
return true;
}
return true;
}
-bool Popup::OnBacking
MouseWheelEvent(Actor actor, const Mouse
WheelEvent& event)
+bool Popup::OnBacking
WheelEvent(Actor actor, const
WheelEvent& event)
{
{
- // consume
mouse
wheel event in dimmed backing actor
+ // consume wheel event in dimmed backing actor
return true;
}
return true;
}
@@
-810,7
+810,7
@@
float Popup::GetWidthForHeight( float height )
return GetNaturalSize().width;
}
return GetNaturalSize().width;
}
-Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus
Navigation
Direction direction, bool loopEnabled)
+Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus
::
Direction direction, bool loopEnabled)
{
Actor nextFocusableActor( currentFocusedActor );
{
Actor nextFocusableActor( currentFocusedActor );
@@
-853,7
+853,7
@@
Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C
{
switch ( direction )
{
{
switch ( direction )
{
- case Toolkit::Control::
Left
:
+ case Toolkit::Control::
KeyboardFocus::LEFT
:
{
if ( iter == focusableActors.begin() )
{
{
if ( iter == focusableActors.begin() )
{
@@
-865,7
+865,7
@@
Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C
}
break;
}
}
break;
}
- case Toolkit::Control::
Right
:
+ case Toolkit::Control::
KeyboardFocus::RIGHT
:
{
if ( iter == focusableActors.end() - 1 )
{
{
if ( iter == focusableActors.end() - 1 )
{
@@
-878,7
+878,7
@@
Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C
break;
}
break;
}
- case Toolkit::Control::
Up
:
+ case Toolkit::Control::
KeyboardFocus::UP
:
{
if ( *iter == mContent )
{
{
if ( *iter == mContent )
{
@@
-905,7
+905,7
@@
Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C
break;
}
break;
}
- case Toolkit::Control::
Down
:
+ case Toolkit::Control::
KeyboardFocus::DOWN
:
{
if ( mContent && mContent.IsKeyboardFocusable() )
{
{
if ( mContent && mContent.IsKeyboardFocusable() )
{