Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 08:22:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

these seemed dangerous

Browse source
This commit is contained in:
SamGondelman 2019-03-01 10:54:44 -08:00
parent b26b02fed6
commit cfb84967d5
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libraries/ui/src/ui/TabletScriptingInterface.cpp
View file

@ -458,6 +458,11 @@ void TabletProxy::emitWebEvent(const QVariant& msg) {
}
void TabletProxy::onTabletShown() {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "onTabletShown");
return;
}
if (_tabletShown) {
Setting::Handle<bool> notificationSounds{ QStringLiteral("play_notification_sounds"), true};
Setting::Handle<bool> notificationSoundTablet{ QStringLiteral("play_notification_sounds_tablet"), true};
@ -485,7 +490,11 @@ bool TabletProxy::isPathLoaded(const QVariant& path) {
}
void TabletProxy::setQmlTabletRoot(OffscreenQmlSurface* qmlOffscreenSurface) {
Q_ASSERT(QThread::currentThread() == qApp->thread());
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setQmlTabletRoot", Q_ARG(OffscreenQmlSurface*, qmlOffscreenSurface));
return;
}
_qmlOffscreenSurface = qmlOffscreenSurface;
_qmlTabletRoot = qmlOffscreenSurface ? qmlOffscreenSurface->getRootItem() : nullptr;
if (_qmlTabletRoot && _qmlOffscreenSurface) {
@ -654,6 +663,11 @@ void TabletProxy::loadQMLSource(const QVariant& path, bool resizable) {
}
void TabletProxy::stopQMLSource() {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "stopQMLSource");
return;
}
// For desktop toolbar mode dialogs.
if (!_toolbarMode || !_desktopWindow) {
qCDebug(uiLogging) << "tablet cannot clear QML because not desktop toolbar mode";
@ -879,6 +893,12 @@ void TabletProxy::sendToQml(const QVariant& msg) {
OffscreenQmlSurface* TabletProxy::getTabletSurface() {
if (QThread::currentThread() != thread()) {
OffscreenQmlSurface* result = nullptr;
BLOCKING_INVOKE_METHOD(this, "getTabletSurface", Q_RETURN_ARG(OffscreenQmlSurface*, result));
return result;
}
return _qmlOffscreenSurface;
}
@ -888,6 +908,11 @@ void TabletProxy::desktopWindowClosed() {
}
void TabletProxy::unfocus() {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "unfocus");
return;
}
if (_qmlOffscreenSurface) {
_qmlOffscreenSurface->lowerKeyboard();
}