aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--data/default-prefs-common.js7
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d156cf1df..1bb3f5da6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-06 Christian Persch <chpe@cvs.gnome.org>
+
+ * data/default-prefs-common.js:
+
+ Make scroll wheel zoom directions HIG compliant; fixes bug #306110.
+
2005-07-05 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/PrintingPromptService.cpp:
diff --git a/data/default-prefs-common.js b/data/default-prefs-common.js
index e1995086f..b24025d6f 100644
--- a/data/default-prefs-common.js
+++ b/data/default-prefs-common.js
@@ -1,8 +1,7 @@
-// mouse wheel: disable mozilla's ctrl+wheel zooming
-// bug: setting this to -1 does not disable the built-in action, but instead
-// prevents event delivery at all!
+// mouse wheel: disable mozilla's ctrl+wheel zooming, and enable our own
+// set numlines to -1 to reverse directions, see bug #306110
pref("mousewheel.withcontrolkey.action", 0);
-pref("mousewheel.withcontrolkey.numlines", 1);
+pref("mousewheel.withcontrolkey.numlines", -1);
pref("mousewheel.withcontrolkey.sysnumlines", false);
// fix horizontal scroll with 2nd wheel, see bug #148557