projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Making DALi public API typesafe using guaranteed types; uint8_t, uint32_t
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
events
/
pan-gesture-detector.cpp
diff --git
a/dali/public-api/events/pan-gesture-detector.cpp
b/dali/public-api/events/pan-gesture-detector.cpp
index
dffbb99
..
860e6a8
100644
(file)
--- a/
dali/public-api/events/pan-gesture-detector.cpp
+++ b/
dali/public-api/events/pan-gesture-detector.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
@@
-24,8
+24,6
@@
namespace Dali
{
namespace Dali
{
-const char* const PanGestureDetector::SIGNAL_PAN_DETECTED = "pan-detected";
-
const Radian PanGestureDetector::DIRECTION_LEFT( -Math::PI );
const Radian PanGestureDetector::DIRECTION_RIGHT( 0.0f );
const Radian PanGestureDetector::DIRECTION_UP( -0.5f * Math::PI );
const Radian PanGestureDetector::DIRECTION_LEFT( -Math::PI );
const Radian PanGestureDetector::DIRECTION_RIGHT( 0.0f );
const Radian PanGestureDetector::DIRECTION_UP( -0.5f * Math::PI );
@@
-70,22
+68,22
@@
PanGestureDetector& PanGestureDetector::operator=(const PanGestureDetector& rhs)
return *this;
}
return *this;
}
-void PanGestureDetector::SetMinimumTouchesRequired(u
nsigned in
t minimum)
+void PanGestureDetector::SetMinimumTouchesRequired(u
int32_
t minimum)
{
GetImplementation(*this).SetMinimumTouchesRequired(minimum);
}
{
GetImplementation(*this).SetMinimumTouchesRequired(minimum);
}
-void PanGestureDetector::SetMaximumTouchesRequired(u
nsigned in
t maximum)
+void PanGestureDetector::SetMaximumTouchesRequired(u
int32_
t maximum)
{
GetImplementation(*this).SetMaximumTouchesRequired(maximum);
}
{
GetImplementation(*this).SetMaximumTouchesRequired(maximum);
}
-u
nsigned in
t PanGestureDetector::GetMinimumTouchesRequired() const
+u
int32_
t PanGestureDetector::GetMinimumTouchesRequired() const
{
return GetImplementation(*this).GetMinimumTouchesRequired();
}
{
return GetImplementation(*this).GetMinimumTouchesRequired();
}
-u
nsigned in
t PanGestureDetector::GetMaximumTouchesRequired() const
+u
int32_
t PanGestureDetector::GetMaximumTouchesRequired() const
{
return GetImplementation(*this).GetMaximumTouchesRequired();
}
{
return GetImplementation(*this).GetMaximumTouchesRequired();
}
@@
-100,9
+98,14
@@
void PanGestureDetector::AddDirection( Radian direction, Radian threshold )
GetImplementation(*this).AddDirection( direction, threshold );
}
GetImplementation(*this).AddDirection( direction, threshold );
}
-const PanGestureDetector::AngleContainer& PanGestureDetector::GetAngles() const
+size_t PanGestureDetector::GetAngleCount() const
+{
+ return GetImplementation(*this).GetAngleCount();
+}
+
+PanGestureDetector::AngleThresholdPair PanGestureDetector::GetAngle(size_t index) const
{
{
- return GetImplementation(*this).GetAngle
s(
);
+ return GetImplementation(*this).GetAngle
(index
);
}
void PanGestureDetector::ClearAngles()
}
void PanGestureDetector::ClearAngles()
@@
-120,7
+123,7
@@
void PanGestureDetector::RemoveDirection( Radian direction )
GetImplementation(*this).RemoveDirection( direction );
}
GetImplementation(*this).RemoveDirection( direction );
}
-PanGestureDetector::DetectedSignal
V2
& PanGestureDetector::DetectedSignal()
+PanGestureDetector::DetectedSignal
Type
& PanGestureDetector::DetectedSignal()
{
return GetImplementation(*this).DetectedSignal();
}
{
return GetImplementation(*this).DetectedSignal();
}