Commit 1bcb2284 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #4244 from DonLakeFlyer/SwipeViewClick

Swipe view click
parents 4d5fddbd 40bb2f19
...@@ -67,7 +67,7 @@ Item { ...@@ -67,7 +67,7 @@ Item {
Rectangle { Rectangle {
height: radius * 2 height: radius * 2
width: radius * 2 width: radius * 2
radius: 2.5 radius: ScreenTools.defaultFontPixelWidth / 3
border.color: textColor border.color: textColor
border.width: 1 border.width: 1
color: _currentPage == index ? textColor : "transparent" color: _currentPage == index ? textColor : "transparent"
...@@ -75,6 +75,21 @@ Item { ...@@ -75,6 +75,21 @@ Item {
} }
} }
MouseArea {
anchors.fill: parent
onClicked: {
if (_currentPage == _maxPage) {
_currentPage = 0
} else {
_currentPage++
}
showPage(_currentPage)
}
}
/*
Switching from swipe to click to change pages. Keeping swipe code for now in case of change back.
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
...@@ -104,4 +119,5 @@ Item { ...@@ -104,4 +119,5 @@ Item {
showPage(_currentPage) showPage(_currentPage)
} }
} }
*/
} }
...@@ -157,7 +157,7 @@ QGCFlickable { ...@@ -157,7 +157,7 @@ QGCFlickable {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: backgroundColor color: backgroundColor
opacity: 0.95 opacity: 0.75
visible: _activeVehicle ? isNaN(_activeVehicle.vibration.xAxis.value) : false visible: _activeVehicle ? isNaN(_activeVehicle.vibration.xAxis.value) : false
QGCLabel { QGCLabel {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment