Skip to content

Commit

Permalink
HID: magicmouse: scroll on entire surface, not just middle of mouse
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chase Douglas authored and Jiri Kosina committed Jun 4, 2010
1 parent 67a3e12 commit ef566d3
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/hid/hid-magicmouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down

0 comments on commit ef566d3

Please sign in to comment.