AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wasm: use config for natural scroll on safari

Browse Source 
Change-Id: Idc2ee096144194e3f0d9ca165a578ff9745ef13d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Lorn Potter 2018-06-29 11:08:27 +10:00
parent d2ca870660
commit 989e86074a
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/platforms/wasm/qwasmeventtranslator.cpp
View File

@ -39,15 +39,27 @@
#include <QtCore/qobject.h>
#include <QtCore/qdeadlinetimer.h>
#include <emscripten/bind.h>
#include <iostream>
QT_BEGIN_NAMESPACE
using namespace emscripten;
// macOS CTRL <-> META switching. We most likely want to enable
// the existing switching code in QtGui, but for now do it here.
static bool g_usePlatformMacCtrlMetaSwitching = false;
bool g_useNaturalScrolling = false;
void setNaturalScrolling(bool use) {
g_useNaturalScrolling = use;
}
EMSCRIPTEN_BINDINGS(mouse_module) {
function("setNaturalScrolling", &setNaturalScrolling);
}
QWasmEventTranslator::QWasmEventTranslator(QObject *parent)
: QObject(parent)
, draggedWindow(nullptr)
@ -84,6 +96,20 @@ QWasmEventTranslator::QWasmEventTranslator(QObject *parent)
Platform(EM_ASM_INT("if (navigator.platform.includes(\"Mac\")) return 1; return 0;"));
g_usePlatformMacCtrlMetaSwitching = (platform == MacOSPlatform);
if (platform == MacOSPlatform) {
g_useNaturalScrolling = true; //make this default on macOS
EM_ASM(
if (window.safari !== undefined) {//this only works on safari
Module["canvas"].addEventListener('wheel', mouseWheelEvent);
function mouseWheelEvent(e) {
if (event.webkitDirectionInvertedFromDevice) {
Module.setNaturalScrolling(event.webkitDirectionInvertedFromDevice);
}
}
}
);
}
}
template <typename Event>
@ -449,6 +475,9 @@ int QWasmEventTranslator::wheel_cb(int eventType, const EmscriptenWheelEvent *wh
break;
};
if (g_useNaturalScrolling) //macOS platform has document oriented scrolling
scrollFactor = -scrollFactor;
Qt::KeyboardModifiers modifiers = translateMouseEventModifier(&mouseEvent);
auto timestamp = mouseEvent.timestamp;
QPoint globalPoint(mouseEvent.canvasX, mouseEvent.canvasY);