From e9ebdf8f02999736ad2be178caa82319a65479c0 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 26 Oct 2009 10:11:17 +0100
Subject: Get rid (for 0.3 release) of shift + arrows scrolling feature. Sorry,
 dudes. We have troubles with it :(

---
 src/webview.cpp | 89 ++-------------------------------------------------------
 src/webview.h   | 20 +------------
 2 files changed, 3 insertions(+), 106 deletions(-)

diff --git a/src/webview.cpp b/src/webview.cpp
index 6f7fdcf5..ce9d421b 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -52,17 +52,12 @@
 #include <QtGui/QClipboard>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QAction>
-#include <QtCore/QTimer>
 
 
 WebView::WebView(QWidget* parent)
         : QWebView(parent)
         , m_page(new WebPage(this))
         , m_progress(0)
-        , m_scrollTimer(new QTimer(this))
-        , m_scrollDirection(WebView::NoScroll)
-        , m_scrollSpeedVertical(0)
-        , m_scrollSpeedHorizontal(0)
         , m_mousePos(QPoint(0,0))
 
 {
@@ -71,9 +66,6 @@ WebView::WebView(QWidget* parent)
     connect(page(), SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&)));
     connect(this, SIGNAL(loadProgress(int)), this, SLOT(slotUpdateProgress(int)));
     connect(this, SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool)));
-
-    connect(m_scrollTimer, SIGNAL(timeout()), this, SLOT(scrollFrameChanged()));
-    m_scrollTimer->setInterval(50);
 }
 
 
@@ -356,83 +348,8 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     menu.exec(mapToGlobal(event->pos()));
 }
 
-
-void WebView::stopScrollAnimation()
-{
-    m_scrollTimer->stop();
-    m_scrollSpeedVertical = 0;
-    m_scrollSpeedHorizontal = 0;
-    m_scrollDirection = WebView::NoScroll;
-}
-
-
-void WebView::startScrollAnimation(ScrollDirection direction)
-{
-    // if no scrollspeed, set the requested direction, otherwise it's just a slowdown or speedup
-    if (m_scrollSpeedVertical == 0 && (direction == WebView::Up || direction == WebView::Down))
-        m_scrollDirection |= direction;
-    if (m_scrollSpeedHorizontal == 0 && (direction == WebView::Left || direction == WebView::Right))
-        m_scrollDirection |= direction;
-
-    // update scrollspeed
-    switch (direction)
-    {
-        case WebView::Up:
-            --m_scrollSpeedVertical;
-            break;
-        case WebView::Down:
-            ++m_scrollSpeedVertical;
-            break;
-        case WebView::Left:
-            --m_scrollSpeedHorizontal;
-            break;
-        case WebView::Right:
-            ++m_scrollSpeedHorizontal;
-            break;
-        default:
-            break;
-    }
-
-    if (!m_scrollTimer->isActive())
-        m_scrollTimer->start();
-
-    return;
-}
-
-
-void WebView::scrollFrameChanged()
-{
-    // clear finished scrolling
-    if (m_scrollSpeedVertical == 0)
-        m_scrollDirection &= ~WebView::Up | ~WebView::Down;
-    if (m_scrollSpeedHorizontal == 0)
-        m_scrollDirection &= ~WebView::Left | ~WebView::Right;
-
-    // all scrolling finished
-    if (m_scrollDirection == WebView::NoScroll)
-    {
-        m_scrollTimer->stop();
-        return;
-    }
-
-    // do the scrolling
-    page()->currentFrame()->scroll(m_scrollSpeedHorizontal, m_scrollSpeedVertical);
-
-    // check if we reached the end
-    int y = page()->currentFrame()->scrollPosition().y();
-    int x = page()->currentFrame()->scrollPosition().x();
-
-    if (y == 0 || y == page()->currentFrame()->scrollBarMaximum(Qt::Vertical))
-        m_scrollSpeedVertical = 0;
-    if (x == 0 || x == page()->currentFrame()->scrollBarMaximum(Qt::Horizontal))
-        m_scrollSpeedHorizontal = 0;
-}
-
-
 void WebView::mousePressEvent(QMouseEvent *event)
 {
-//     stopScrollAnimation();
-
     m_page->m_pressedButtons = event->buttons();
     m_page->m_keyboardModifiers = event->modifiers();
 
@@ -468,8 +385,6 @@ QPoint WebView::mousePos()
 
 void WebView::wheelEvent(QWheelEvent *event)
 {
-//     stopScrollAnimation();
-
     if (QApplication::keyboardModifiers() & Qt::ControlModifier)
     {
         int numDegrees = event->delta() / 8;
@@ -493,13 +408,13 @@ void WebView::slotSearch()
 
 void WebView::slotUpdateProgress(int p)
 {
-    m_progress=p;
+    m_progress = p;
 }
 
 
 void WebView::slotLoadFinished(bool)
 {
-    m_progress=0;
+    m_progress = 0;
 }
 
 
diff --git a/src/webview.h b/src/webview.h
index 5331d4cf..03ceb739 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -37,24 +37,13 @@
 
 // Forward Declarations
 class WebPage;
-class QTimer;
 
 
 class WebView : public QWebView
 {
     Q_OBJECT
-    Q_ENUMS(ScrollDirection)
 
 public:
-    enum ScrollDirection
-    {
-        NoScroll = 0,
-        Up = 2,
-        Down = 4,
-        Left = 6,
-        Right = 16
-    };
-    
     explicit WebView(QWidget *parent = 0);
     ~WebView();
     
@@ -83,18 +72,11 @@ private slots:
     void openLinkInNewWindow();
     void openLinkInNewTab();
 
-    void startScrollAnimation(ScrollDirection direction);
-    void stopScrollAnimation();
-    void scrollFrameChanged();
-
 private:
     WebPage *m_page;
     int m_progress;
     QString m_statusBarText;
-    QTimer *m_scrollTimer;
-    int m_scrollDirection;
-    int m_scrollSpeedVertical;
-    int m_scrollSpeedHorizontal;
+
     QPoint m_mousePos;
 };
 
-- 
cgit v1.2.1