Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-10 01:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10990 from druiz17/bug-help-issue

Browse source 
fixed another instance of the tablet getting stuck on the help screen
This commit is contained in:
Andrew Meadows 2017-07-19 08:37:56 -07:00 committed by GitHub
commit d48f45f7e6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,7 +229,6 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
} else {
removeButtonsFromToolbar();
addButtonsToHomeScreen();
emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
// destroy desktop window
if (_desktopWindow) {
@ -237,6 +236,8 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
_desktopWindow = nullptr;
}
}
loadHomeScreen(true);
emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
}
static void addButtonProxyToQmlTablet(QQuickItem* qmlTablet, TabletButtonProxy* buttonProxy) {