diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-06 14:14:53 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-14 18:18:48 +0000 |
| commit | b2f43ac03326bed8f8890998be510f83dc58b68c (patch) | |
| tree | abf7c9e2a03c0e45d87fb63122f785946d4673a0 /src/core | |
| parent | 20238f2c472af7b94d48a837d7723a209a87fd9e (diff) | |
Speculative fix for disable-pinch not working
Introduces logic from render_widget_host_view_android.cc to ignore
pinch gestures when pinch is disabled.
Fixes: QTBUG-70913
Change-Id: Ib88c423c248148afdb2d203f89ab90c63b32012c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 4ed62504f..bc41337d9 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -53,6 +53,7 @@ #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/browser/frame_host/frame_tree.h" #include "content/browser/renderer_host/render_view_host_impl.h" +#include "content/common/content_switches_internal.h" #include "content/common/cursors/webcursor.h" #include "content/common/input_messages.h" #include "third_party/skia/include/core/SkColor.h" @@ -880,6 +881,13 @@ void RenderWidgetHostViewQt::selectionChanged() void RenderWidgetHostViewQt::OnGestureEvent(const ui::GestureEventData& gesture) { + if ((gesture.type() == ui::ET_GESTURE_PINCH_BEGIN + || gesture.type() == ui::ET_GESTURE_PINCH_UPDATE + || gesture.type() == ui::ET_GESTURE_PINCH_END) + && !content::IsPinchToZoomEnabled()) { + return; + } + host()->ForwardGestureEvent(ui::CreateWebGestureEventFromGestureEventData(gesture)); } |