History

Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight

More consistent highlights/toggle for toolbar buttons

Chris Collins committed 9 years ago

Commit b295a142 parents 44136e5 71b569a7 files · +171 −51Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 7 files). Show all

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+1−0
@@ -366,6 +366,7 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS · 365 unmodified lines
366 }366 }
367 367
368 if (root) {368 if (root) {
369 removeButtonsFromHomeScreen();
369 QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));370 QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));
370 QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));371 QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
371 QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));372 QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));