Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
1bcb2284
Commit
1bcb2284
authored
Nov 24, 2016
by
Don Gagne
Committed by
GitHub
Nov 24, 2016
Browse files
Merge pull request #4244 from DonLakeFlyer/SwipeViewClick
Swipe view click
parents
4d5fddbd
40bb2f19
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/FlightMap/Widgets/InstrumentSwipeView.qml
View file @
1bcb2284
...
@@ -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)
}
}
}
}
*/
}
}
src/FlightMap/Widgets/VibrationWidget.qml
View file @
1bcb2284
...
@@ -157,7 +157,7 @@ QGCFlickable {
...
@@ -157,7 +157,7 @@ QGCFlickable {
Rectangle
{
Rectangle
{
anchors.fill
:
parent
anchors.fill
:
parent
color
:
backgroundColor
color
:
backgroundColor
opacity
:
0.
9
5
opacity
:
0.
7
5
visible
:
_activeVehicle
?
isNaN
(
_activeVehicle
.
vibration
.
xAxis
.
value
)
:
false
visible
:
_activeVehicle
?
isNaN
(
_activeVehicle
.
vibration
.
xAxis
.
value
)
:
false
QGCLabel
{
QGCLabel
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment