Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 15:47:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Tablet springboard can now be scrolled

Browse source
This commit is contained in:
Anthony J. Thibault 2017-01-12 13:10:31 -08:00
parent 0746d38cae
commit b251dc9ed6
2 changed files with 28 additions and 11 deletions
interface/resources/qml/hifi/tablet
Tablet.qml
scripts/developer/tests
tabletTest.js

31
interface/resources/qml/hifi/tablet/Tablet.qml
View file

@ -170,19 +170,28 @@ Item {
anchors.top: bgTopBar.bottom
anchors.topMargin: 0
Flow {
id: flowMain
spacing: 16
anchors.right: parent.right
anchors.rightMargin: 30
anchors.left: parent.left
anchors.leftMargin: 30
anchors.bottom: parent.bottom
anchors.bottomMargin: 30
anchors.top: parent.top
anchors.topMargin: 30
Flickable {
id: flickable
width: parent.width
height: parent.height
contentWidth: parent.width
contentHeight: flowMain.childrenRect.height + flowMain.anchors.topMargin + flowMain.anchors.bottomMargin + flowMain.spacing
clip: true
Flow {
id: flowMain
spacing: 16
anchors.right: parent.right
anchors.rightMargin: 30
anchors.left: parent.left
anchors.leftMargin: 30
anchors.bottom: parent.bottom
anchors.bottomMargin: 30
anchors.top: parent.top
anchors.topMargin: 30
}
}
}
states: [
State {
name: "muted state"

8
scripts/developer/tests/tabletTest.js
View file

@ -15,6 +15,14 @@ var button = tablet.addButton({
text: "BAM!!!"
});
var TEST_BUTTON_COUNT = 10;
for (var i = 0; i < TEST_BUTTON_COUNT; i++) {
tablet.addButton({
text: "TEST_" + i,
inDebugMode: true
});
}
// change the name and isActive state every second...
var names = ["BAM!", "BAM!!", "BAM!!!", "BAM!!!!"];
var nameIndex = 0;