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

Swipe area expanded to whole tablet. Icons doesnt stick together anymore

Browse source
This commit is contained in:
vladest 2017-11-30 21:10:12 +01:00
parent 69264a6ea8
commit f510b4bcd8
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ Item {
return -1; return -1;
} }
for (var gridIndex = 0; gridIndex < swipeView.count; gridIndex++) { for (var gridIndex = 0; gridIndex < swipeView.count; gridIndex++) {
var grid = swipeView.itemAt(gridIndex) var grid = swipeView.itemAt(gridIndex).children[0]
for (var i in grid.children) { for (var i in grid.children) {
var child = grid.children[i]; var child = grid.children[i];
if (child.uuid === uuid) { if (child.uuid === uuid) {
@ -35,7 +35,8 @@ Item {
function sortButtons(gridIndex) { function sortButtons(gridIndex) {
var children = []; var children = [];
var grid = swipeView.itemAt(gridIndex) var grid = swipeView.itemAt(gridIndex).children[0]
for (var i = 0; i < grid.children.length; i++) { for (var i = 0; i < grid.children.length; i++) {
children[i] = grid.children[i]; children[i] = grid.children[i];
} }
@ -53,7 +54,7 @@ Item {
} }
function doAddButton(grid, gridIndex, component, properties) { function doAddButton(grid, gridIndex, component, properties) {
var button = component.createObject(grid); var button = component.createObject(grid.children[0]);
// copy all properites to button // copy all properites to button
var keys = Object.keys(properties).forEach(function (key) { var keys = Object.keys(properties).forEach(function (key) {
@ -75,14 +76,26 @@ Item {
Component { Component {
id: pageComponent id: pageComponent
Grid { rows: 4; columns: 3; rowSpacing: 16; columnSpacing: 16; } Item {
visible: SwipeView.isCurrentItem
Grid {
anchors {
fill: parent
topMargin: 20
leftMargin: 30
rightMargin: 30
bottomMargin: 0
}
rows: 4; columns: 3; rowSpacing: 16; columnSpacing: 16;
}
}
} }
// called by C++ code when a button should be added to the tablet // called by C++ code when a button should be added to the tablet
function addButtonProxy(properties) { function addButtonProxy(properties) {
var component = Qt.createComponent("TabletButton.qml"); var component = Qt.createComponent("TabletButton.qml");
var grid = swipeView.itemAt(swipeView.count - 1) var grid = swipeView.itemAt(swipeView.count - 1)
if (grid === null || grid.children.length === 12) { if (grid === null || grid.children[0].children.length === 12) {
grid = pageComponent.createObject(swipeView) grid = pageComponent.createObject(swipeView)
swipeView.addItem(grid) swipeView.addItem(grid)
} }
@ -95,7 +108,7 @@ Item {
if (index.index < 0) { if (index.index < 0) {
console.log("Warning: Tablet.qml could not find button with uuid = " + properties.uuid); console.log("Warning: Tablet.qml could not find button with uuid = " + properties.uuid);
} else { } else {
var grid = swipeView.itemAt(index.page) var grid = swipeView.itemAt(index.page).children[0]
grid.children[index.index].destroy(); grid.children[index.index].destroy();
tablet.count-- tablet.count--
} }
@ -190,27 +203,19 @@ Item {
} }
} }
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: 0
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 0
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0
anchors.top: bgTopBar.bottom anchors.top: bgTopBar.bottom
anchors.topMargin: 0
SwipeView { SwipeView {
id: swipeView id: swipeView
clip: true clip: false
currentIndex: pageIndicator.currentIndex currentIndex: pageIndicator.currentIndex
anchors { anchors {
left: parent.left left: parent.left
right: parent.right right: parent.right
top: parent.top top: parent.top
bottom: pageIndicator.top bottom: pageIndicator.top
topMargin: 20
leftMargin: 30
rightMargin: 30
bottomMargin: 0
} }
Component.onCompleted: { Component.onCompleted: {
if (contentItem !== null) { if (contentItem !== null) {
@ -261,7 +266,7 @@ Item {
function getPage(row, column) { function getPage(row, column) {
var pageIndex = Math.floor((row + column) / 12) var pageIndex = Math.floor((row + column) / 12)
var index = (row + column) % 12 var index = (row + column) % 12
var page = swipeView.itemAt(pageIndex) var page = swipeView.itemAt(pageIndex).children[0]
return { page: page, index: index, pageIndex: pageIndex } return { page: page, index: index, pageIndex: pageIndex }
} }