Le vendredi 21 mai 2010 11:21:27, Benjamin Poulain a écrit :
> here are two spaces before the second &&. Not your fault obviously but
> the patch is an opportunity to fix it :)
Here a new version of the patch fixing space and tooltip ;)
Please give a look at tooltip string to fix any bug with my english :)
--
Cédric Bellegarde
diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index f7771cb..c0060d7 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 1996d6a..e1ed78f 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())
{
_______________________________________________
rekonq mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/rekonq
