Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -216,8 +216,10 @@ void TabletProxy::setToolbarMode(bool toolbarMode) { · 215 unmodified lines | |||
| 216 | connect(tabletRootWindow, &QmlWindowClass::fromQml, this, &TabletProxy::fromQml); | 216 | connect(tabletRootWindow, &QmlWindowClass::fromQml, this, &TabletProxy::fromQml); |
| 217 | }); | 217 | }); |
| 218 | } else { | 218 | } else { |
| 219 | _state = State::Home; | ||
| 219 | removeButtonsFromToolbar(); | 220 | removeButtonsFromToolbar(); |
| 220 | addButtonsToHomeScreen(); | 221 | addButtonsToHomeScreen(); |
| 222 | emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL)); | ||
| 221 | 223 | ||
| 222 | // destroy desktop window | 224 | // destroy desktop window |
| 223 | if (_desktopWindow) { | 225 | if (_desktopWindow) { |
| @@ -627,8 +629,8 @@ void TabletProxy::addButtonsToHomeScreen() { · 403 unmodified lines | |||
| 627 | for (auto& buttonProxy : _tabletButtonProxies) { | 629 | for (auto& buttonProxy : _tabletButtonProxies) { |
| 628 | addButtonProxyToQmlTablet(tablet, buttonProxy.data()); | 630 | addButtonProxyToQmlTablet(tablet, buttonProxy.data()); |
| 629 | } | 631 | } |
| 630 | auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | 632 | auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); |
| 631 | QObject::disconnect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen())); | 633 | QObject::disconnect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen())); |
| 632 | } | 634 | } |
| 633 | 635 | ||
| 634 | QObject* TabletProxy::getTabletSurface() { | 636 | QObject* TabletProxy::getTabletSurface() { |