aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/views
diff options
context:
space:
mode:
Diffstat (limited to 'src/views')
-rw-r--r--src/views/SkTouchGesture.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/views/SkTouchGesture.cpp b/src/views/SkTouchGesture.cpp
index 752828e37f..cd7388b6e1 100644
--- a/src/views/SkTouchGesture.cpp
+++ b/src/views/SkTouchGesture.cpp
@@ -331,10 +331,12 @@ bool SkTouchGesture::handleDblTap(float x, float y) {
return found;
}
-void SkTouchGesture::setTransLimit(const SkRect& contentRect, const SkRect& windowRect) {
+void SkTouchGesture::setTransLimit(const SkRect& contentRect, const SkRect& windowRect,
+ const SkMatrix& preTouchMatrix) {
fIsTransLimited = true;
fContentRect = contentRect;
fWindowRect = windowRect;
+ fPreTouchM = preTouchMatrix;
}
void SkTouchGesture::limitTrans() {
@@ -343,6 +345,7 @@ void SkTouchGesture::limitTrans() {
}
SkRect scaledContent = fContentRect;
+ fPreTouchM.mapRect(&scaledContent);
fGlobalM.mapRect(&scaledContent);
const SkScalar ZERO = 0;