summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2010-06-02 10:28:25 -0400
committerJiri Kosina <jkosina@suse.cz>2010-06-04 12:06:32 +0200
commitef566d30a702cc9b49d24edc4ad45c62208a4f5d (patch)
tree4676aefbbad0dd3f9d2915c665a450cce1939a77 /drivers/hid
parent67a3e12b05e055c0415c556a315a3d3eb637e29e (diff)
downloadop-kernel-dev-ef566d30a702cc9b49d24edc4ad45c62208a4f5d.zip
op-kernel-dev-ef566d30a702cc9b49d24edc4ad45c62208a4f5d.tar.gz
HID: magicmouse: scroll on entire surface, not just middle of mouse
Previously, scroll events only occurred when the user moved a touch along the middle of the touch surface. This is unintuitive for a normal user who is not aware of this. The device has a uniform surface, so the distinction is artificial. This change removes the touch area check for a scroll event, which replicates the OS X behavior. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Michael Poole <mdpoole@troilus.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-magicmouse.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index f10d56a..cd70635 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -160,10 +160,9 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
msc->touches[id].size = misc & 63;
/* If requested, emulate a scroll wheel by detecting small
- * vertical touch motions along the middle of the mouse.
+ * vertical touch motions.
*/
- if (emulate_scroll_wheel &&
- middle_button_start < x && x < middle_button_stop) {
+ if (emulate_scroll_wheel) {
static const int accel_profile[] = {
256, 228, 192, 160, 128, 96, 64, 32,
};
OpenPOWER on IntegriCloud