Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:58:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed merge issues

Browse source
This commit is contained in:
Dante Ruiz 2017-02-17 00:08:31 +00:00
commit 628b97bfc6
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/tablet/TabletMenu.qml
View file

@ -19,7 +19,10 @@ FocusScope {
height: 720 height: 720
property var rootMenu: Menu { objectName:"rootMenu" } property var rootMenu: Menu { objectName:"rootMenu" }
property var point: Qt.point(50, 50) property var point: Qt.point(50, 50);
property var eventBridge;
signal sendToScript(var message);
TabletMenuStack { id: menuPopperUpper }
property string subMenu: "" property string subMenu: ""
property var eventBridge; property var eventBridge;
signal sendToScript(var message); signal sendToScript(var message);

2
interface/resources/qml/hifi/tablet/TabletMenuStack.qml
View file

@ -82,9 +82,7 @@ Item {
} }
function popMenu() { function popMenu() {
console.log("the depth of the stack " + d.depth);
if (d.depth) { if (d.depth) {
console.log("trying to pop page from stack");
d.pop(); d.pop();
} }
if (d.depth) { if (d.depth) {

1
interface/src/Application.cpp
View file

@ -5745,7 +5745,6 @@ bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name)
void Application::toggleRunningScriptsWidget() const { void Application::toggleRunningScriptsWidget() const {
DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts"); DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");
//if (_runningScriptsWidget->isVisible()) { //if (_runningScriptsWidget->isVisible()) {
// if (_runningScriptsWidget->hasFocus()) { // if (_runningScriptsWidget->hasFocus()) {
// _runningScriptsWidget->hide(); // _runningScriptsWidget->hide();