Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 1 file). Show all
Unified · Split
| @@ -170,7 +170,6 @@ QObject* TabletScriptingInterface::getFlags() · 169 unmodified lines | |||
| 170 | static const char* TABLET_SOURCE_URL = "Tablet.qml"; | 170 | static const char* TABLET_SOURCE_URL = "Tablet.qml"; |
| 171 | static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml"; | 171 | static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml"; |
| 172 | static const char* VRMENU_SOURCE_URL = "TabletMenu.qml"; | 172 | static const char* VRMENU_SOURCE_URL = "TabletMenu.qml"; |
| 173 | static int s_windowNameCounter = 1; | ||
| 174 | 173 | ||
| 175 | class TabletRootWindow : public QmlWindowClass { | 174 | class TabletRootWindow : public QmlWindowClass { |
| 176 | virtual QString qmlSource() const { return "hifi/tablet/WindowRoot.qml"; } | 175 | virtual QString qmlSource() const { return "hifi/tablet/WindowRoot.qml"; } |
| @@ -193,7 +192,7 @@ void TabletProxy::setToolbarMode(bool toolbarMode) { · 16 unmodified lines | |||
| 193 | 192 | ||
| 194 | // create new desktop window | 193 | // create new desktop window |
| 195 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); | 194 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); |
| 196 | offscreenUi->executeOnUiThread([=, this] { | 195 | offscreenUi->executeOnUiThread([=] { |
| 197 | auto tabletRootWindow = new TabletRootWindow(); | 196 | auto tabletRootWindow = new TabletRootWindow(); |
| 198 | tabletRootWindow->initQml(QVariantMap()); | 197 | tabletRootWindow->initQml(QVariantMap()); |
| 199 | auto quickItem = tabletRootWindow->asQuickItem(); | 198 | auto quickItem = tabletRootWindow->asQuickItem(); |