projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen](ATSPI) Fix Native TC fails
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
accessibility
/
common
/
accessibility-adaptor-impl.cpp
diff --git
a/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
b/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
678f13a
..
d3eb43b
--- a/
dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
+++ b/
dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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,9
+23,9
@@
#include <dali/integration-api/debug.h>
#include <dali/integration-api/events/touch-event-integ.h>
#include <dali/integration-api/events/hover-event-integ.h>
#include <dali/integration-api/debug.h>
#include <dali/integration-api/events/touch-event-integ.h>
#include <dali/integration-api/events/hover-event-integ.h>
-#include <dali/integration-api/events/gesture-requests.h>
// INTERNAL INCLUDES
// INTERNAL INCLUDES
+#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/system/common/system-settings.h>
namespace Dali
#include <dali/internal/system/common/system-settings.h>
namespace Dali
@@
-159,8
+159,8
@@
bool AccessibilityAdaptor::HandleActionReadEvent(unsigned int x, unsigned int y,
DALI_LOG_INFO(gAccessibilityAdaptorLogFilter, Debug::General, "[%s:%d] %d , %d\n", __FUNCTION__, __LINE__, x, y);
DALI_LOG_INFO(gAccessibilityAdaptorLogFilter, Debug::General, "[%s:%d] %d , %d\n", __FUNCTION__, __LINE__, x, y);
- mReadPosition.x =
x
;
- mReadPosition.y =
y
;
+ mReadPosition.x =
static_cast< float > (x)
;
+ mReadPosition.y =
static_cast< float > (y)
;
if( mActionHandler )
{
if( mActionHandler )
{
@@
-241,7
+241,7
@@
bool AccessibilityAdaptor::HandleActionClearFocusEvent()
return ret;
}
return ret;
}
-bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, u
nsigned long
timeStamp)
+bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, u
int32_t
timeStamp)
{
bool ret = false;
{
bool ret = false;
@@
-270,7
+270,7
@@
bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsi
return ret;
}
return ret;
}
-bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, u
nsigned long
timeStamp)
+bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, u
int32_t
timeStamp)
{
bool ret = false;
{
bool ret = false;