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

equal deleted inserted replaced

-:6aeb7a756187
+:3c88a81ff781
 #include <QGraphicsSceneMouseEvent>
 #include <QTimer>
 #include <qmath.h>
 #include <QDebug>
 #include <QGraphicsView>
+#include <QInputContext>
 namespace GVA {
 const int KFlickSpeed = 400;
 const qreal PI = 3.1415926535897932;
 const qreal KDeccelaration = 1000.00;
 static const int KStartPanDistance = 50;
 static const int KWaitForClickTimeoutMS = 200;
 static const int KLongPressDuration = 1000;
-static const int KLongPressThreshold = 30;
+static const int KLongPressThreshold = 18;
 //The amount of pixels to try to pan before pan mode unlocks
 static const int KPanModeChangeDelta = 100;
 /*!
 \class WebTouchNavigation
 mouseDoubleClickEvent(static_cast<QGraphicsSceneMouseEvent*>(event)->pos().toPoint());
 emit mouseEvent(QEvent::GraphicsSceneMouseDoubleClick);
 return true;
 case QEvent::GraphicsSceneContextMenu:
 contextMenuEvent();
+// for orbit fw app, long press triggers context menu event which selects closest word
+#ifdef ORBIT_UI
+return true;
+#else
 break;
+#endif
 default:
 break;
 }
 return false;
 }
 }
 if (m_pressEvent){
 QPoint diff2 = m_pressEvent->pos() - pos;
 if (qAbs(diff2.x()) < KTouchThresholdX && qAbs(diff2.y()) < KTouchThresholdY) {
-return;
+if (!m_frame)
+return;
+QWebHitTestResult htr = m_frame->hitTestContent(m_touchPosition);
+if (!htr.isContentEditable())
+return;
 }
 }
 if (m_doubleClickTimer && m_doubleClickTimer->isActive()) {
 //send mousePressEvent
 if (hitTestResult.isContentEditable()) {
 QMouseEvent moveEvt(QEvent::MouseMove, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
 m_webPage->event(&moveEvt);
 m_textSelected = true;
 }
+} else { // FIXME add following lines to enable the auto-scroll while selecting text
+if (m_textSelected) {
+QMouseEvent moveEvt(QEvent::MouseMove, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+m_webPage->event(&moveEvt);
+}
 }
 }
 if (!m_textSelected)
 scrollFrame(diff);
 startScrollTimer();
 }
 } else {
 // we don't want to automatically display the SIP (Software input panel) by qtwebkit
 bool sipEnabled = qApp->autoSipEnabled();
-qApp->setAutoSipEnabled(false);
+//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()) {
+QEvent* vkbEvent;
-QEvent vkbEvent(QEvent::RequestSoftwareInputPanel);
+QInputContext *ic = qApp->inputContext();
-QList<QGraphicsView*> views = m_view->scene()->views();
+if (htr.isContentEditable())
-QWidget* view = qobject_cast<QWidget*>(views.value(0));
+	vkbEvent = new QEvent(QEvent::RequestSoftwareInputPanel);
-if (view)
+else
-QApplication::sendEvent(view, &vkbEvent);
+	vkbEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
-}
+if (ic)
+	ic->filterEvent(vkbEvent);
+delete vkbEvent;
 }
 #endif
 }
 }
 void GWebTouchNavigation::mouseDoubleClickEvent(const QPoint& pos)
 {
 if (m_doubleClickTimer && !m_doubleClickTimer->isActive())
 return;
 else if (m_doubleClickTimer)
 m_doubleClickTimer->stop();
 void GWebTouchNavigation::onLoadFinished(bool ok)
 {
 Q_UNUSED(ok)
 m_isLoading = false;
 }
-void GWebTouchNavigation::setPage( QWebPage * page)
+void GWebTouchNavigation::setPage( QWebPage * page, bool aWantSlideView)
 {
-if (m_webPage) {
+// Need to listen to the load signals to determine whethter slideView should
+// be called when scrolling. This is called only when m_wantSlideViewCalls is set and hence,
+// there is no need to disconnect and connect to these signals if m_wantSlideViewCalls/ new value
+// of m_wantSlideViewCalls is false
+if (m_webPage && m_wantSlideViewCalls) {
 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 &)));
 }
 m_webPage = page;
-if (m_webPage) {
+m_wantSlideViewCalls = aWantSlideView;
+if (m_webPage && m_wantSlideViewCalls) {
 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 &)));
 }
 }
 void GWebTouchNavigation::enableDClick(bool aValue)
 {
 m_doubleClickEnabled = aValue;
 }
-}
+}

changeset 16	3c88a81ff781
parent 3	0954f5dd2cd0