From fdd4ddf97883cb98bdaa026547648151d58306c1 Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Sat, 11 Feb 2012 11:18:27 +0100 Subject: [PATCH] manage the tablette scrolling --- jni/Android.mk | 1 + jni/edn/CustumWidget/CodeView/CodeView.cpp | 34 ++++++++++++++-------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 2178fb3..8257584 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -16,6 +16,7 @@ LOCAL_SRC_FILES := ewolAndroidAbstraction.cpp \ LOCAL_LDLIBS := -llog -landroid LOCAL_CFLAGS := -D__PLATFORM__Android \ + -D__MODE__Touch \ -DEWOL_USE_FREE_TYPE \ -DETK_DEBUG_LEVEL=3 \ -DEDN_DEBUG_LEVEL=3 \ diff --git a/jni/edn/CustumWidget/CodeView/CodeView.cpp b/jni/edn/CustumWidget/CodeView/CodeView.cpp index ea9f89a..ada2c65 100644 --- a/jni/edn/CustumWidget/CodeView/CodeView.cpp +++ b/jni/edn/CustumWidget/CodeView/CodeView.cpp @@ -192,18 +192,28 @@ bool CodeView::OnEventInput(int32_t IdInput, ewol::eventInputType_te typeEvent, EDN_DEBUG("Event : " << IdInput << " type : " << type << " position(" << x << "," << y << ")"); */ if (1 == IdInput) { - if (ewol::EVENT_INPUT_TYPE_DOWN == typeEvent) { - m_buttunOneSelected = true; - ewol::widgetManager::FocusKeep(this); - //EDN_INFO("mouse-event BT1 ==> One Clicked %d, %d", (uint32_t)event->x, (uint32_t)event->y); - m_bufferManager->Get(m_bufferID)->MouseEvent(x, y); - MarkToReedraw(); - } else if (ewol::EVENT_INPUT_TYPE_UP == typeEvent) { - m_buttunOneSelected = false; - m_bufferManager->Get(m_bufferID)->Copy(COPY_MIDDLE_BUTTON); - MarkToReedraw(); - } else if (ewol::EVENT_INPUT_TYPE_SINGLE == typeEvent) { - // nothing to do ... + #ifndef __MODE__Touch + if (ewol::EVENT_INPUT_TYPE_DOWN == typeEvent) { + m_buttunOneSelected = true; + ewol::widgetManager::FocusKeep(this); + //EDN_INFO("mouse-event BT1 ==> One Clicked %d, %d", (uint32_t)event->x, (uint32_t)event->y); + m_bufferManager->Get(m_bufferID)->MouseEvent(x, y); + MarkToReedraw(); + } else if (ewol::EVENT_INPUT_TYPE_UP == typeEvent) { + m_buttunOneSelected = false; + m_bufferManager->Get(m_bufferID)->Copy(COPY_MIDDLE_BUTTON); + MarkToReedraw(); + } else + #endif + if (ewol::EVENT_INPUT_TYPE_SINGLE == typeEvent) { + #ifdef __MODE__Touch + ewol::widgetManager::FocusKeep(this); + //EDN_INFO("mouse-event BT1 ==> One Clicked %d, %d", (uint32_t)event->x, (uint32_t)event->y); + m_bufferManager->Get(m_bufferID)->MouseEvent(x, y); + MarkToReedraw(); + #else + // nothing to do ... + #endif } else if (ewol::EVENT_INPUT_TYPE_DOUBLE == typeEvent) { //EDN_INFO("mouse-event BT1 ==> Double Clicked %d, %d", (uint32_t)event->x, (uint32_t)event->y); m_bufferManager->Get(m_bufferID)->MouseEventDouble();