projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dabfa49
)
Revert "Revert "Move TouchPoint to Devel API""
author
Joogab Yun
<joogab.yun@samsung.com>
Mon, 7 Sep 2020 05:39:09 +0000
(14:39 +0900)
committer
Joogab Yun
<joogab.yun@samsung.com>
Mon, 7 Sep 2020 05:39:09 +0000
(14:39 +0900)
This reverts commit
f26bce354ce5547d57bbffd7468fceb7ef34d335
.
dali/devel-api/adaptor-framework/accessibility-adaptor.h
patch
|
blob
|
history
dali/integration-api/adaptor-framework/adaptor.h
patch
|
blob
|
history
dali/internal/accessibility/common/accessibility-adaptor-impl.h
patch
|
blob
|
history
dali/internal/adaptor/android/framework-android.cpp
patch
|
blob
|
history
dali/internal/window-system/common/event-handler.cpp
patch
|
blob
|
history
diff --git
a/dali/devel-api/adaptor-framework/accessibility-adaptor.h
b/dali/devel-api/adaptor-framework/accessibility-adaptor.h
index
9be2483
..
733ec07
100755
(executable)
--- a/
dali/devel-api/adaptor-framework/accessibility-adaptor.h
+++ b/
dali/devel-api/adaptor-framework/accessibility-adaptor.h
@@
-20,7
+20,7
@@
// EXTERNAL INCLUDES
// EXTERNAL INCLUDES
-#include <dali/
public
-api/events/touch-point.h>
+#include <dali/
devel
-api/events/touch-point.h>
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/dali-adaptor-common.h>
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/dali-adaptor-common.h>
diff --git
a/dali/integration-api/adaptor-framework/adaptor.h
b/dali/integration-api/adaptor-framework/adaptor.h
index
834f25c
..
6985275
100644
(file)
--- a/
dali/integration-api/adaptor-framework/adaptor.h
+++ b/
dali/integration-api/adaptor-framework/adaptor.h
@@
-24,7
+24,7
@@
#include <dali/public-api/math/uint-16-pair.h>
#include <dali/public-api/math/rect.h>
#include <dali/public-api/object/any.h>
#include <dali/public-api/math/uint-16-pair.h>
#include <dali/public-api/math/rect.h>
#include <dali/public-api/object/any.h>
-#include <dali/
public
-api/events/touch-point.h>
+#include <dali/
devel
-api/events/touch-point.h>
#include <dali/integration-api/processor-interface.h>
// INTERNAL INCLUDES
#include <dali/integration-api/processor-interface.h>
// INTERNAL INCLUDES
diff --git
a/dali/internal/accessibility/common/accessibility-adaptor-impl.h
b/dali/internal/accessibility/common/accessibility-adaptor-impl.h
index
2e1511e
..
ed79b3e
100644
(file)
--- a/
dali/internal/accessibility/common/accessibility-adaptor-impl.h
+++ b/
dali/internal/accessibility/common/accessibility-adaptor-impl.h
@@
-23,7
+23,7
@@
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/math/vector2.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/math/vector2.h>
-#include <dali/
public
-api/events/touch-point.h>
+#include <dali/
devel
-api/events/touch-point.h>
#include <dali/integration-api/events/touch-event-combiner.h>
// INTERNAL INCLUDES
#include <dali/integration-api/events/touch-event-combiner.h>
// INTERNAL INCLUDES
diff --git
a/dali/internal/adaptor/android/framework-android.cpp
b/dali/internal/adaptor/android/framework-android.cpp
index
4d34aa0
..
f91f596
100644
(file)
--- a/
dali/internal/adaptor/android/framework-android.cpp
+++ b/
dali/internal/adaptor/android/framework-android.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
14
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.
@@
-27,7
+27,7
@@
#include <dali/integration-api/debug.h>
#include <dali/integration-api/adaptor-framework/adaptor.h>
#include <dali/integration-api/adaptor-framework/android/android-framework.h>
#include <dali/integration-api/debug.h>
#include <dali/integration-api/adaptor-framework/adaptor.h>
#include <dali/integration-api/adaptor-framework/android/android-framework.h>
-#include <dali/
public
-api/events/touch-point.h>
+#include <dali/
devel
-api/events/touch-point.h>
#include <dali/public-api/events/key-event.h>
#include <dali/devel-api/events/key-event-devel.h>
#include <dali/public-api/events/key-event.h>
#include <dali/devel-api/events/key-event-devel.h>
@@
-389,7
+389,7
@@
struct Framework::Impl
int32_t deviceId = AInputEvent_getDeviceId( event );
float x = AMotionEvent_getX( event, 0 );
float y = AMotionEvent_getY( event, 0 );
int32_t deviceId = AInputEvent_getDeviceId( event );
float x = AMotionEvent_getX( event, 0 );
float y = AMotionEvent_getY( event, 0 );
-
TouchPoint::State state = TouchPoint::Down
;
+
Dali::PointState::Type state = Dali::PointState::DOWN
;
int32_t action = AMotionEvent_getAction( event );
int64_t timeStamp = AMotionEvent_getEventTime( event );
int32_t action = AMotionEvent_getAction( event );
int64_t timeStamp = AMotionEvent_getEventTime( event );
@@
-398,16
+398,16
@@
struct Framework::Impl
case AMOTION_EVENT_ACTION_DOWN:
break;
case AMOTION_EVENT_ACTION_UP:
case AMOTION_EVENT_ACTION_DOWN:
break;
case AMOTION_EVENT_ACTION_UP:
- state =
TouchPoint::Up
;
+ state =
Dali::PointState::UP
;
break;
case AMOTION_EVENT_ACTION_MOVE:
break;
case AMOTION_EVENT_ACTION_MOVE:
- state =
TouchPoint::Motion
;
+ state =
Dali::PointState::MOTION
;
break;
case AMOTION_EVENT_ACTION_CANCEL:
break;
case AMOTION_EVENT_ACTION_CANCEL:
- state =
TouchPoint::Interrupted
;
+ state =
Dali::PointState::INTERRUPTED
;
break;
case AMOTION_EVENT_ACTION_OUTSIDE:
break;
case AMOTION_EVENT_ACTION_OUTSIDE:
- state =
TouchPoint::Leave
;
+ state =
Dali::PointState::LEAVE
;
break;
}
break;
}
diff --git
a/dali/internal/window-system/common/event-handler.cpp
b/dali/internal/window-system/common/event-handler.cpp
index
cf8720a
..
7a1d02b
100755
(executable)
--- a/
dali/internal/window-system/common/event-handler.cpp
+++ b/
dali/internal/window-system/common/event-handler.cpp
@@
-22,7
+22,7
@@
#include <cstring>
#include <sys/time.h>
#include <cstring>
#include <sys/time.h>
-#include <dali/
public
-api/events/touch-point.h>
+#include <dali/
devel
-api/events/touch-point.h>
#include <dali/public-api/events/key-event.h>
#include <dali/public-api/events/wheel-event.h>
#include <dali/integration-api/debug.h>
#include <dali/public-api/events/key-event.h>
#include <dali/public-api/events/wheel-event.h>
#include <dali/integration-api/debug.h>
@@
-266,22
+266,22
@@
void EventHandler::OnAccessibilityNotification( const WindowBase::AccessibilityI
}
// Create a touch point object.
}
// Create a touch point object.
-
TouchPoint::State touchPointState( TouchPoint::Down
);
+
PointState::Type touchPointState( PointState::DOWN
);
if( info.state == 0 )
{
if( info.state == 0 )
{
- touchPointState =
TouchPoint::Down
; // Mouse down.
+ touchPointState =
PointState::DOWN
; // Mouse down.
}
else if( info.state == 1 )
{
}
else if( info.state == 1 )
{
- touchPointState =
TouchPoint::Motion
; // Mouse move.
+ touchPointState =
PointState::MOTION
; // Mouse move.
}
else if( info.state == 2 )
{
}
else if( info.state == 2 )
{
- touchPointState =
TouchPoint::Up
; // Mouse up.
+ touchPointState =
PointState::UP
; // Mouse up.
}
else
{
}
else
{
- touchPointState =
TouchPoint::Interrupted
; // Error.
+ touchPointState =
PointState::INTERRUPTED
; // Error.
}
// Send touch event to accessibility adaptor.
}
// Send touch event to accessibility adaptor.