← Back to branch summary

~brandontschaefer/mir/lp.1233089-fix-v-h-scroll

« back to all changes in this revision

Viewing changes to src/shared/input/android/android_input_lexicon.cpp

  • Committer: Brandon Schaefer
  • Date: 2013-10-07 17:35:20 UTC
  • mfrom: (1086.2.4 mir)
  • Revision ID: brandontschaefer@gmail.com-20131007173520-o7o7ov0366yyc8um
* Add v/h scroll to the MirMotionEvent vs the pointer_cor* struct.
  getPointerCount is guaranteed to be >= 1. So just assume we are using the first pointer count.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shared/input/android/android_input_lexicon.cpp
59
59
            mir_event.motion.y_offset = mev->getYOffset();
60
60
            mir_event.motion.x_precision = mev->getXPrecision();
61
61
            mir_event.motion.y_precision = mev->getYPrecision();
 
62
            mir_event.motion.vscroll = mev->getRawAxisValue(AMOTION_EVENT_AXIS_VSCROLL, 0);
 
63
            mir_event.motion.hscroll = mev->getRawAxisValue(AMOTION_EVENT_AXIS_HSCROLL, 0);
62
64
            mir_event.motion.down_time = mev->getDownTime();
63
65
            mir_event.motion.event_time = mev->getEventTime();
64
66
            mir_event.motion.pointer_count = mev->getPointerCount();
 
67
 
65
68
            for(unsigned int i = 0; i < mev->getPointerCount(); i++)
66
69
            {
67
70
                    mir_event.motion.pointer_coordinates[i].id = mev->getPointerId(i);