Tried to make a cleaner onTouchEvent refs #2741
Look at issue #3