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

Merge pull request #9591 from druiz17/master

Browse source 
fixed issue of tablets buliding up when flying fast
This commit is contained in:
Seth Alves 2017-02-02 15:21:29 -08:00 committed by GitHub
commit 9dfaf3026b
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,10 @@ FocusScope {
onEntered: iconColorOverlay.color = "#1fc6a6"; onEntered: iconColorOverlay.color = "#1fc6a6";
onExited: iconColorOverlay.color = "#ffffff"; onExited: iconColorOverlay.color = "#ffffff";
// navigate back to root level menu // navigate back to root level menu
onClicked: buildMenu(); onClicked: {
buildMenu();
tabletRoot.playButtonClickSound();
}
} }
} }
@ -79,10 +82,12 @@ FocusScope {
onEntered: breadcrumbText.color = "#1fc6a6"; onEntered: breadcrumbText.color = "#1fc6a6";
onExited: breadcrumbText.color = "#34a2c7"; onExited: breadcrumbText.color = "#34a2c7";
// navigate back to parent level menu if there is one // navigate back to parent level menu if there is one
onClicked: onClicked: {
if (breadcrumbText.text !== "Menu") { if (breadcrumbText.text !== "Menu") {
menuPopperUpper.closeLastMenu(); menuPopperUpper.closeLastMenu();
} }
tabletRoot.playButtonClickSound();
}
} }
} }
} }

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

@ -75,7 +75,10 @@ FocusScope {
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
onEntered: listView.currentIndex = index onEntered: listView.currentIndex = index
onClicked: root.selected(item) onClicked: {
root.selected(item)
tabletRoot.playButtonClickSound();
}
} }
} }

1
scripts/system/libraries/WebTablet.js
View file

@ -335,6 +335,7 @@ WebTablet.prototype.cleanUpOldTablets = function() {
this.cleanUpOldTabletsOnJoint(SENSOR_TO_ROOM_MATRIX); this.cleanUpOldTabletsOnJoint(SENSOR_TO_ROOM_MATRIX);
this.cleanUpOldTabletsOnJoint(CAMERA_MATRIX); this.cleanUpOldTabletsOnJoint(CAMERA_MATRIX);
this.cleanUpOldTabletsOnJoint(65529); this.cleanUpOldTabletsOnJoint(65529);
this.cleanUpOldTabletsOnJoint(65534);
}; };
WebTablet.prototype.unregister = function() { WebTablet.prototype.unregister = function() {