summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-21 16:00:51 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-21 16:00:51 +0200
commit67737269a6358994dc1468e247691cf15e42ad7f (patch)
tree3a4f41e38a90d6bcaadc66f5eab01929ca57fcf2 /src
parenttitle for bookmark. Removed fallback mechanism (diff)
downloadrekonq-67737269a6358994dc1468e247691cf15e42ad7f.tar.xz
Cedric's patch
let autoscroll being optional (active by default..)
Diffstat (limited to 'src')
-rw-r--r--src/rekonq.kcfg3
-rw-r--r--src/settings/settings_general.ui19
-rw-r--r--src/webview.cpp2
3 files changed, 23 insertions, 1 deletions
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
@@ -244,6 +244,25 @@
</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">
<enum>Qt::Vertical</enum>
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())
{