From 67737269a6358994dc1468e247691cf15e42ad7f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 21 May 2010 16:00:51 +0200
Subject: Cedric's patch let autoscroll being optional (active by default..)

---
 src/rekonq.kcfg                  |  3 +++
 src/settings/settings_general.ui | 19 +++++++++++++++++++
 src/webview.cpp                  |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 9aa30e35..6769b4f5 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -69,6 +69,9 @@
     <entry name="searchEngine" type="Int">
         <default>0</default>
     </entry>
+    <entry name="disableAutoScroll" type="Bool">
+        <default>false</default>
+    </entry>
 </group>
 
 
diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index f7771cbc..c0060d76 100644
--- a/src/settings/settings_general.ui
+++ b/src/settings/settings_general.ui
@@ -243,6 +243,25 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_5">
+     <property name="title">
+      <string>Navigation</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QCheckBox" name="kcfg_disableAutoScroll">
+        <property name="toolTip">
+         <string>Disable automatic scrolling on middle click in a web page</string>
+        </property>
+        <property name="text">
+         <string>Disable auto scrolling</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
diff --git a/src/webview.cpp b/src/webview.cpp
index 86b60fac..99c48f0b 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -316,7 +316,7 @@ void WebView::mousePressEvent(QMouseEvent *event)
     }
 
     QWebHitTestResult result = page()->mainFrame()->hitTestContent(event->pos());
-    _canEnableAutoScroll = !result.isContentEditable()  && result.linkUrl().isEmpty();
+    _canEnableAutoScroll = !ReKonfig::disableAutoScroll() && !result.isContentEditable()  && result.linkUrl().isEmpty();
 
     switch (event->button())
     {
-- 
cgit v1.2.1