Enable horizontal scrolling without shift modifier

[woelfman]

fixes #2359

The current implementation strictly scrolls vertically without the shift modifier and horizontally with the shift modifier. This patch checks the modifier only when the direction is Both.