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
Fix compile error. Non initialized variable.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
tooltip
/
tooltip.cpp
diff --git
a/dali-toolkit/internal/controls/tooltip/tooltip.cpp
b/dali-toolkit/internal/controls/tooltip/tooltip.cpp
index
3df8a04
..
80a558e
100644
(file)
--- a/
dali-toolkit/internal/controls/tooltip/tooltip.cpp
+++ b/
dali-toolkit/internal/controls/tooltip/tooltip.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
17
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
@@
-23,7
+23,7
@@
#include <dali/public-api/events/hover-event.h>
#include <dali/public-api/adaptor-framework/timer.h>
#include <dali/public-api/events/hover-event.h>
#include <dali/public-api/adaptor-framework/timer.h>
-#include <dali/
public
-api/common/stage.h>
+#include <dali/
devel
-api/common/stage.h>
#include <dali/devel-api/scripting/enum-helper.h>
// INTERNAL INCLUDES
#include <dali/devel-api/scripting/enum-helper.h>
// INTERNAL INCLUDES
@@
-385,30
+385,30
@@
void Tooltip::SetTail( const Property::Value& value )
bool Tooltip::OnHovered( Actor /* actor */, const HoverEvent& hover )
{
bool Tooltip::OnHovered( Actor /* actor */, const HoverEvent& hover )
{
- const
TouchPoint::State state = hover.points[0].state
;
+ const
PointState::Type state = hover.GetState( 0 )
;
switch( state )
{
switch( state )
{
- case
TouchPoint::Started
:
- case
TouchPoint::Motion
:
+ case
PointState::STARTED
:
+ case
PointState::MOTION
:
{
if( ! mPopup )
{
if( ! mTooltipTimer )
{
{
if( ! mPopup )
{
if( ! mTooltipTimer )
{
- mHoverPoint = hover.
points[ 0 ].screen
;
+ mHoverPoint = hover.
GetScreenPosition( 0 )
;
mTooltipTimer = Timer::New( mWaitTime );
mTooltipTimer.TickSignal().Connect( this, &Tooltip::OnTimeout );
mTooltipTimer.Start();
}
else
{
mTooltipTimer = Timer::New( mWaitTime );
mTooltipTimer.TickSignal().Connect( this, &Tooltip::OnTimeout );
mTooltipTimer.Start();
}
else
{
- Vector2 movement = mHoverPoint - hover.
points[ 0 ].screen
;
+ Vector2 movement = mHoverPoint - hover.
GetScreenPosition( 0 )
;
if( std::abs( movement.Length() ) > mMovementThreshold )
{
mTooltipTimer.Stop();
mTooltipTimer.Reset();
if( std::abs( movement.Length() ) > mMovementThreshold )
{
mTooltipTimer.Stop();
mTooltipTimer.Reset();
- mHoverPoint = hover.
points[ 0 ].screen
;
+ mHoverPoint = hover.
GetScreenPosition( 0 )
;
mTooltipTimer = Timer::New( mWaitTime );
mTooltipTimer.TickSignal().Connect( this, &Tooltip::OnTimeout );
mTooltipTimer.Start();
mTooltipTimer = Timer::New( mWaitTime );
mTooltipTimer.TickSignal().Connect( this, &Tooltip::OnTimeout );
mTooltipTimer.Start();
@@
-419,7
+419,7
@@
bool Tooltip::OnHovered( Actor /* actor */, const HoverEvent& hover )
{
// Popup is showing, and we're set to disappear on excessive movement so make sure we're still within the threshold.
{
// Popup is showing, and we're set to disappear on excessive movement so make sure we're still within the threshold.
- Vector2 movement = mHoverPoint - hover.
points[ 0 ].screen
;
+ Vector2 movement = mHoverPoint - hover.
GetScreenPosition( 0 )
;
if( std::abs( movement.Length() ) > mMovementThreshold )
{
// Exceeding the threshold, hide the popup.
if( std::abs( movement.Length() ) > mMovementThreshold )
{
// Exceeding the threshold, hide the popup.
@@
-438,9
+438,9
@@
bool Tooltip::OnHovered( Actor /* actor */, const HoverEvent& hover )
}
break;
}
}
break;
}
- case
TouchPoint::Finished
:
- case
TouchPoint::Leave
:
- case
TouchPoint::Interrupted
:
+ case
PointState::FINISHED
:
+ case
PointState::LEAVE
:
+ case
PointState::INTERRUPTED
:
{
if( mTooltipTimer )
{
{
if( mTooltipTimer )
{
@@
-455,8
+455,7
@@
bool Tooltip::OnHovered( Actor /* actor */, const HoverEvent& hover )
break;
}
break;
}
- case TouchPoint::Stationary:
- case TouchPoint::Last:
+ case PointState::STATIONARY:
{
break;
}
{
break;
}