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

saving work

Browse source
This commit is contained in:
Dante Ruiz 2017-02-17 18:47:59 +00:00
parent 08ffa18008
commit dedd85d296
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/tablet/TabletRoot.qml
View file

@ -81,6 +81,7 @@ Item {
loader.item.subMenu = option; loader.item.subMenu = option;
} }
loader.item.forceActiveFocus(); loader.item.forceActiveFocus();
tabletRoot.findStackableChild();
} }
} }

10
interface/src/Application.cpp
View file

@ -5747,9 +5747,13 @@ bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name)
} }
void Application::toggleRunningScriptsWidget() const { void Application::toggleRunningScriptsWidget() const {
static const QUrl url("hifi/dialogs/RunningScripts.qml"); static const QUrl url("../../hifi/dialogs/TabletRunningScripts.qml");
DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts"); auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
if (tablet) {
tablet->pushOntoStack(url);
}
//DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");
//if (_runningScriptsWidget->isVisible()) { //if (_runningScriptsWidget->isVisible()) {
// if (_runningScriptsWidget->hasFocus()) { // if (_runningScriptsWidget->hasFocus()) {
// _runningScriptsWidget->hide(); // _runningScriptsWidget->hide();