Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Changelog {#Changelog}

# git master (1.1.0)

* [22](https://github.com/BlueBrain/Tide/pull/22):
Detect TapAndHold with the mouse
* [21](https://github.com/BlueBrain/Tide/pull/21):
Bugfix: avoid setting ContentSize to zero on empty deflect::SizeHints event
* [18](https://github.com/BlueBrain/Tide/pull/18):
Expand Down
6 changes: 6 additions & 0 deletions tide/master/MultitouchArea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ void MultitouchArea::mousePressEvent( QMouseEvent* mouse )

_mousePrevPos = pos;
emit touchStarted( pos );

_startTapAndHoldGesture();
}

void MultitouchArea::mouseMoveEvent( QMouseEvent* mouse )
Expand All @@ -134,6 +136,8 @@ void MultitouchArea::mouseMoveEvent( QMouseEvent* mouse )
const QPointF delta = pos - _mousePrevPos;
_mousePrevPos = pos;

_cancelTapAndHoldGesture();

_startPanGesture( pos );
emit pan( pos, delta );
}
Expand All @@ -145,6 +149,8 @@ void MultitouchArea::mouseReleaseEvent( QMouseEvent* mouse )
emit tap( pos );

_cancelPanGesture();
_cancelTapAndHoldGesture();

emit touchEnded( pos );
}

Expand Down