FCL/sf/app/browserui: comparison ginebra2/GWebTouchNavigation.cpp

equal deleted inserted replaced

-:0f2326c2a325
+:1c3b8676e58c
 * Description:
 *
 */
 #include "GWebTouchNavigation.h"
+#include "wrtBrowserUtils.h"
 #include <QWebPage>
 #include <QWebFrame>
 #include <QApplication>
 #include <QWebElement>
-#include "GWebContentViewWidget.h"
-#include "GWebContentView.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QTimer>
 #include <qmath.h>
 #include <QDebug>
 #include <QGraphicsView>
-#include <QGraphicsSceneContextMenuEvent>
-#include "wrtBrowserUtils.h"
+namespace GVA {
-#include "ChromeWidget.h"
-#include <QDebug>
-#define LONG_PRESS_DURATION 500
 const int KFlickSpeed = 400;
 const qreal PI = 3.1415926535897932;
 const qreal KAngleTolerance = 30;
 const int KAnimationTimeout = 40;
 const int KTouchThresholdX = 20;
 const int KTouchThresholdY = 20;
 const int KPanThreshold = 2;
 const int KThreshHoldValForLink = 10;
 const qreal KDeccelaration = 1000.00;
-//const int KDefaultViewportWidth = 980;
-//const int KDefaultPortraitScaleWidth = 540;
-//const int KKineticTimeout = 60;
 static const int KStartPanDistance = 50;
 static const int KWaitForClickTimeoutMS = 200;
+static const int KLongPressDuration = 1000;
+static const int KLongPressThreshold = 30;
 //The amount of pixels to try to pan before pan mode unlocks
 static const int KPanModeChangeDelta = 100;
-namespace GVA {
 /*!
 \class WebTouchNavigation
 \since cwrt 1.0
 \brief cwrt navigation.
 , m_textSelected(false)
 , m_isLoading(false)
 , m_contentHeight(0)
 , m_isContextEvent(false)
 , m_wantSlideViewCalls(true)
+, m_doubleClickEnabled(true)
 {
 install();
 connect(m_webPage, SIGNAL(loadStarted()), this, SLOT(onLoadStarted()));
 connect(m_webPage, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool)));
 }
 inline void GWebTouchNavigation::cancelPressEvent() {
 if (m_pressEvent) {
 delete m_pressEvent;
 m_pressEvent = 0;
 }
 /*!
 */
 GWebTouchNavigation::~GWebTouchNavigation()
 {
-disconnect(m_doubleClickTimer, SIGNAL(timeout()), this, SLOT(doubleClickTimerExpired()));
+delete m_doubleClickTimer;
-if (m_doubleClickTimer) {
-m_doubleClickTimer->stop();
-delete m_doubleClickTimer;
-}
-disconnect(m_scrollTimer, SIGNAL(timeout()),this,SLOT(pan()));
 delete m_scrollTimer;
-disconnect(m_kineticTimer, SIGNAL(timeout()),this,SLOT(kineticScroll()));
 delete m_kineticTimer;
+delete m_longPressTimer;
 uninstall();
 cancelPressEvent();
 cancelReleaseEvent();
 }
 */
 void GWebTouchNavigation::scrollFrame(const QPoint& diff)
 {
 if (qAbs(diff.x()) < KPanThreshold && qAbs(diff.y()) < KPanThreshold)
 return;
 else if (m_dragPoints.size() == 1) {
 setViewBlockElement(QWebElement());
 }
 if (!m_isPanning) {
 qreal dy = qAbs(diff.y());
 qreal dx = qAbs(diff.x());
 if (dy > KStartPanDistance || dx > KStartPanDistance
 || m_delayedPressMoment.elapsed() > KWaitForClickTimeoutMS) {
 //get the scroll direction
 Direction scrollDir = findDirectionWithAngle(diff);
 if (scrollDir == UP || scrollDir == DOWN)
 startPanGesture(VerticalPan);
 else if (scrollDir == LEFT || scrollDir == RIGHT)
 startPanGesture(RandomPan);
 m_isPanning = true;
 }
 }
 if (m_isPanning) {
 m_scrolled= false;
 m_frame = getNextScrollableFrame(diff);
 QPoint scrollPosition = m_frame->scrollPosition();
 if (diff.manhattanLength())
 panBy(diff);
 m_scrolled = (scrollPosition != m_frame->scrollPosition());
 }
 }
 void GWebTouchNavigation::startPanGesture(PanDirection directionHint) {
 emit startingPanGesture((int)directionHint);
 m_panDirection = directionHint;
 m_scrolled = false;
 m_ishighlighted = false;
 m_higlightedPos = m_touchPosition = pos;
 m_frame = m_webPage->frameAt(pos);
 if (!m_frame)
 m_frame = m_webPage->currentFrame();
 m_dragPoints.clear();
 DragPoint dragPoint;
 dragPoint.iPoint = m_touchPosition;
 cancelPressEvent();
 cancelReleaseEvent();
 m_doubleClickTimer->start(KDoubleClickTimeOut);
 m_pressEvent = new QMouseEvent(QEvent::MouseButtonPress, pos, Qt::LeftButton, Qt::LeftButton, getEventModifier(pos));
+m_longPressPosition = pos;
+startLongPressTimer();
 }
 void GWebTouchNavigation::handleMousePressEvent(QMouseEvent* ev)
 {
 if (!ev) return;
 m_lastMoveEventTime.setHMS(0,0,0,0); //H, M, S, mS
-if (!m_longPressTimer){
-delete m_longPressTimer;
-m_longPressTimer = 0;
-}
-startTimer();
 m_scrolled = false;
 m_ishighlighted = false;
 m_higlightedPos = m_touchPosition = ev->pos();
 m_frame = m_webPage->frameAt(ev->pos());
 if (!m_frame)
 m_dragPoints.append(dragPoint);
 m_offset = 0;
 highlightableElement(ev);
-getFocusedElement();
+emitFocusedElementChanged();
 //send a mouse press
 QMouseEvent iev(ev->type(), m_touchPosition, ev->button(), ev->buttons(), getEventModifier(m_higlightedPos));
 m_webPage->event(&iev);
 m_textSelected = false;
 if (m_doubleClickTimer && m_doubleClickTimer->isActive())
 m_doubleClickTimer->stop();
 }
 bool GWebTouchNavigation::canDehighlight(QMouseEvent* ev)
 {
 bool checkDehighlight = false;
 QPoint pt = ev->pos() + m_frame->scrollPosition();
 if (m_scrolled && m_ishighlighted) {
 checkDehighlight = true;
 else if (m_offset){
 QPoint centerpt = m_anchorElement.geometry().center();
 int newoffset = (pt.x()- centerpt.x())*(pt.x()- centerpt.x()) + (pt.y()- centerpt.y())*(pt.y()- centerpt.y());
 if (newoffset <= m_offset ) {
 m_offset = newoffset;
 checkDehighlight = false;
 }
 else {
 m_offset =0;
 checkDehighlight = true;
 }
 checkDehighlight = true;
 }
 }
 return checkDehighlight;
 }
 void  GWebTouchNavigation::dehighlight(QMouseEvent* ev)
 {
 m_higlightedPos = QPoint(0,0);
 m_ishighlighted = false;
 QMouseEvent iev(QEvent::MouseButtonPress,m_higlightedPos,ev->button(), ev->buttons(), ev->modifiers());
 m_webPage->event(&iev);
 Scrolls the frame
 \sa scrollFrame()
 */
 void GWebTouchNavigation::mouseMoveEvent(const QPoint& pos, const QPoint& diff)
 {
+if (m_longPressTimer && m_longPressTimer->isActive()){
+QPoint diff2 = m_longPressPosition - pos;
+if (qAbs(diff2.x()) > KLongPressThreshold || qAbs(diff2.y()) > KLongPressThreshold) {
+stopLongPressTimer();
+}
+}
 if (m_pressEvent){
 QPoint diff2 = m_pressEvent->pos() - pos;
-if (qAbs(diff2.x()) < KTouchThresholdX && qAbs(diff2.y()) < KTouchThresholdY)
+if (qAbs(diff2.x()) < KTouchThresholdX && qAbs(diff2.y()) < KTouchThresholdY) {
 return;
+}
 }
 if (m_doubleClickTimer && m_doubleClickTimer->isActive()) {
 //send mousePressEvent
 m_doubleClickTimer->stop();
 handleMousePressEvent(m_pressEvent);
 cancelPressEvent();
 }
-stopTimer();
 QMouseEvent tmpEv(QEvent::MouseMove, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
 handleHighlightChange(&tmpEv);
 //the viewport hasn't been scrolled
 if (!m_scrolled) {
 }
 }
 if (!m_textSelected)
 scrollFrame(diff);
 //m_touchPosition = pos;
 DragPoint dragPoint;
 dragPoint.iPoint = pos;
 dragPoint.iTime = QTime::currentTime();
 m_dragPoints.append(dragPoint);
 QTime now(QTime::currentTime());
 m_lastMoveEventTime.setHMS(now.hour(),now.minute(), now.second(), now.msec());
 while (m_dragPoints.size() > 4)
 m_dragPoints.removeFirst();
 }
 /*!
 If WebCanvas or QWebFrame were scrolled starts the deceleration alogrithm
 Otherwise sends the mouse release event to QWebPage
 \sa startDeceleration()
 */
 void GWebTouchNavigation::mouseReleaseEvent(const QPoint& pos)
 {
+stopLongPressTimer();
 if (m_isPanning)
 m_isPanning = false;
 if (m_doubleClickTimer && m_doubleClickTimer->isActive()) {
 m_releaseEvent = new QMouseEvent(QEvent::MouseButtonRelease, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
 return;
 void GWebTouchNavigation::handleMouseReleaseEvent(QMouseEvent* ev)
 {
 m_frame = m_webPage->frameAt(ev->pos());
 if (!m_frame)
 m_frame = m_webPage->currentFrame();
-assert(m_frame);
+Q_ASSERT(m_frame);
-stopTimer();
+stopLongPressTimer();
 if (m_scrolled) {
 int msecs = 0;
 if (!m_lastMoveEventTime.isNull()) {
 //Start deceleration only if the delta since last drag event is less than threshold
 QTime now(QTime::currentTime());
 msecs = m_lastMoveEventTime.msecsTo(now);
 setNewScrollDistance(blockCanvasPoint, thresholdCheckVal);
 }
 startScrollTimer();
 }
 } else {
+// we don't want to automatically display the SIP (Software input panel) by qtwebkit
+bool sipEnabled = qApp->autoSipEnabled();
+qApp->setAutoSipEnabled(false);
 QMouseEvent iev = m_ishighlighted ?
 QMouseEvent(ev->type(), m_higlightedPos, ev->button(), ev->buttons(), getEventModifier(m_higlightedPos)) :
 QMouseEvent(QEvent::MouseButtonRelease, m_touchPosition, ev->button(), ev->buttons(), getEventModifier(m_touchPosition));
 m_webPage->event(&iev);
+qApp->setAutoSipEnabled(sipEnabled);
 #if defined __SYMBIAN32__
 // FIXME Remove this, it will be fixed Qt 4.6.3 ?
 if (ev->button() == Qt::LeftButton) {
 QWebHitTestResult htr = m_frame->hitTestContent(ev->pos());
 if (htr.isContentEditable()) {
 handleDoubleClickEvent(&tmpEv);
 }
 void GWebTouchNavigation::handleDoubleClickEvent(QMouseEvent* ev)
 {
+if (!m_doubleClickEnabled)
+return;
 QPoint imageFocusPoint;
 QWebHitTestResult hitTest = getHitTestResult(ev);
 QWebElement block = hitTest.element();
 if (m_scrollDistance.x() < (-(documentTouchPoint.x()-m_touchPosition.x())))
 m_scrollDistance.setX(-(documentTouchPoint.x()-m_touchPosition.x()));
 if (m_scrollDistance.y() > ((contentSize.height()-documentViewPoint.y())/2))
 m_scrollDistance.setY((contentSize.height()-documentViewPoint.y())/2);
 break;
+default: break;
 }
 }
 /*
 Distinguishes b/w swipe and flick
 direction = TOPLEFT;
 }
 else if (isNear(angle, 300.0, 330.0)) {
 direction = TOPRIGHT;
 }
-assert(direction != NONE);
+Q_ASSERT(direction != NONE);
 return direction;
 }
 /*
 m_scrollTimer->stop();
 return;
 }
 scrollCurrentFrame(diffX, diffY);
 }
-void GWebTouchNavigation::timerControl()
-{
+void GWebTouchNavigation::onLongPressTimer()
-stopTimer();// stop timer as soon as timeout
+{
-emit longPressEvent();
+stopLongPressTimer();// stop timer as soon as timeout
-}
+emit longPressEvent(m_touchPosition);
-void GWebTouchNavigation::startTimer()
+}
-{
-m_longPressTimer = new QTimer(this);
+void GWebTouchNavigation::startLongPressTimer()
-connect(m_longPressTimer,SIGNAL(timeout()),this,SLOT(timerControl()));
+{
-m_longPressTimer->start(LONG_PRESS_DURATION);
+if(!m_longPressTimer) {
-}
+m_longPressTimer = new QTimer(this);
-void GWebTouchNavigation::stopTimer()
+connect(m_longPressTimer, SIGNAL(timeout()), this, SLOT(onLongPressTimer()));
+}
+else {
+m_longPressTimer->stop();
+}
+m_longPressTimer->start(KLongPressDuration);
+}
+void GWebTouchNavigation::stopLongPressTimer()
 {
 if (m_longPressTimer){
 m_longPressTimer->stop();
 delete m_longPressTimer;
 m_longPressTimer = 0;
 }
 }
-void GWebTouchNavigation::getFocusedElement()
+void GWebTouchNavigation::emitFocusedElementChanged()
 {
 QWebHitTestResult htRes = m_frame->hitTestContent(m_touchPosition);
 wrtBrowserDefs::BrowserElementType elType = wrtBrowserUtils::getTypeFromElement(htRes);
 emit focusElementChanged(elType);
 }
 dy+=slide;
 }
 /* shrink the viewport size at bottom if content is scrolled to bottom,
 so that use can click the link under the toolbar */
+/*
 if (m_frame == m_webPage->mainFrame()) {
 if (scrollPosition.y() + m_webPage->viewportSize().height() >= m_frame->contentsSize().height()) {
 qreal slide = shrinkView(-dy);
 dy+=slide;
 }
-/*
-else {
-qDebug()<<"scrollPosition.y() = "<<scrollPosition.y()<<" m_webPage->viewportSize().height() = "<<m_webPage->viewportSize().height()<<" m_frame->contentsSize().height() = "<<m_frame->contentsSize().height();
-}*/
 }
+*/
 m_frame->scroll(dx, dy);
 }
 void GWebTouchNavigation::setCurrentFrameScrollPosition (QPoint& pos)
 qreal slide = slideView(-dy);
 dy+=slide;
 finalPos.setY(scrollPosition.y() - dy);
 }
+/*
 if (m_frame == m_webPage->mainFrame()) {
 if (scrollPosition.y() + m_webPage->viewportSize().height() == m_frame->contentsSize().height()) {
 qreal slide = shrinkView(-dy);
 dy-=slide;
 }
 finalPos.setY(scrollPosition.y() - dy);
 }
+*/
 m_frame->setScrollPosition(finalPos);
 }
 void GWebTouchNavigation::onLoadStarted()
 {
 void GWebTouchNavigation::setPage( QWebPage * page)
 {
 if (m_webPage) {
 disconnect(m_webPage, SIGNAL(loadStarted()), this, SLOT(onLoadStarted()));
 disconnect(m_webPage, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool)));
-disconnect(m_webPage->mainFrame(), SIGNAL(contentsSizeChanged(const QSize &)), this, SLOT(onContentsSizeChanged(const QSize &)));
+//disconnect(m_webPage->mainFrame(), SIGNAL(contentsSizeChanged(const QSize &)), this, SLOT(onContentsSizeChanged(const QSize &)));
 }
 m_webPage = page;
 if (m_webPage) {
 connect(m_webPage, SIGNAL(loadStarted()), this, SLOT(onLoadStarted()));
 connect(m_webPage, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool)));
-connect(m_webPage->mainFrame(), SIGNAL(contentsSizeChanged(const QSize &)), this, SLOT(onContentsSizeChanged(const QSize &)));
+//connect(m_webPage->mainFrame(), SIGNAL(contentsSizeChanged(const QSize &)), this, SLOT(onContentsSizeChanged(const QSize &)));
 }
 }
 void GWebTouchNavigation::onContentsSizeChanged(const QSize & size)
 {
 if (m_webPage->mainFrame()->contentsSize().height() != m_contentHeight) {
 m_contentHeight = m_webPage->mainFrame()->contentsSize().height();
 shrinkView(100);
 }
 }
-}
+void GWebTouchNavigation::enableDClick(bool aValue)
+{
+m_doubleClickEnabled = aValue;
+}
+}

changeset 6	1c3b8676e58c
parent 5	0f2326c2a325