Skip to content

Q
qgroundcontrol
Commit ffe6bfd4 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #4363 from DonLakeFlyer/DropButtonParent 

Fix DropButton parenting
parents 3f88517e d53bb78e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 207 deletions
src/FlightDisplay/FlightDisplayViewMap.qml
View file @ ffe6bfd4
...@@ -77,7 +77,7 @@ FlightMap { ...@@ -77,7 +77,7 @@ FlightMap {
color: mapPal.text color: mapPal.text
visible: !ScreenTools.isShortScreen visible: !ScreenTools.isShortScreen
anchors.topMargin: _toolButtonTopMargin anchors.topMargin: _toolButtonTopMargin
anchors.horizontalCenter: toolColumn.horizontalCenter anchors.horizontalCenter: centerMapDropButton.horizontalCenter
anchors.top: parent.top anchors.top: parent.top
} }
...@@ -103,109 +103,116 @@ FlightMap { ...@@ -103,109 +103,116 @@ FlightMap {
} }
} }
Column { // IMPORTANT NOTE: Drop Buttons must be parented directly to the map. If they are placed in a Column for example the drop control positioning
id: toolColumn // will not work correctly.
anchors.topMargin: ScreenTools.isShortScreen ? _toolButtonTopMargin : ScreenTools.defaultFontPixelHeight / 2
anchors.leftMargin: ScreenTools.defaultFontPixelHeight //-- Map Center Control
anchors.left: parent.left CenterMapDropButton {
anchors.top: ScreenTools.isShortScreen ? parent.top : flyLabel.bottom id: centerMapDropButton
spacing: ScreenTools.defaultFontPixelHeight anchors.topMargin: flyLabel.visible ? ScreenTools.defaultFontPixelHeight / 2 : _toolButtonTopMargin
anchors.leftMargin: ScreenTools.defaultFontPixelHeight
anchors.left: parent.left
anchors.top: flyLabel.visible ? flyLabel.bottom : parent.top
z: QGroundControl.zOrderWidgets
exclusiveGroup: dropButtonsExclusiveGroup
map: _flightMap
mapFitViewport: Qt.rect(leftToolWidth, _toolButtonTopMargin, flightMap.width - leftToolWidth - rightPanelWidth, flightMap.height - _toolButtonTopMargin)
usePlannedHomePosition: false
geoFenceController: geoFenceController
missionController: missionController
rallyPointController: rallyPointController
showFollowVehicle: true
followVehicle: _followVehicle
onFollowVehicleChanged: _followVehicle = followVehicle
property real leftToolWidth: centerMapDropButton.x + centerMapDropButton.width
}
//-- Map Type Control
DropButton {
id: mapTypeButton
anchors.topMargin: ScreenTools.defaultFontPixelHeight
anchors.top: centerMapDropButton.bottom
anchors.left: centerMapDropButton.left
dropDirection: dropRight
buttonImage: "/qmlimages/MapType.svg"
viewportMargins: ScreenTools.defaultFontPixelWidth / 2
exclusiveGroup: dropButtonsExclusiveGroup
z: QGroundControl.zOrderWidgets z: QGroundControl.zOrderWidgets
lightBorders: isSatelliteMap
//-- Map Center Control dropDownComponent: Component {
CenterMapDropButton { Column {
id: centerMapDropButton spacing: ScreenTools.defaultFontPixelWidth
exclusiveGroup: dropButtonsExclusiveGroup
map: _flightMap
mapFitViewport: Qt.rect(leftToolWidth, _toolButtonTopMargin, flightMap.width - leftToolWidth - rightPanelWidth, flightMap.height - _toolButtonTopMargin)
usePlannedHomePosition: false
geoFenceController: geoFenceController
missionController: missionController
rallyPointController: rallyPointController
showFollowVehicle: true
followVehicle: _followVehicle
onFollowVehicleChanged: _followVehicle = followVehicle
property real leftToolWidth: centerMapDropButton.x + centerMapDropButton.width
}
//-- Map Type Control Row {
DropButton {
id: mapTypeButton
dropDirection: dropRight
buttonImage: "/qmlimages/MapType.svg"
viewportMargins: ScreenTools.defaultFontPixelWidth / 2
exclusiveGroup: dropButtonsExclusiveGroup
z: QGroundControl.zOrderWidgets
lightBorders: isSatelliteMap
dropDownComponent: Component {
Column {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
Row { Repeater {
spacing: ScreenTools.defaultFontPixelWidth model: QGroundControl.flightMapSettings.mapTypes
Repeater {
model: QGroundControl.flightMapSettings.mapTypes
QGCButton { QGCButton {
checkable: true checkable: true
checked: QGroundControl.flightMapSettings.mapType === text checked: QGroundControl.flightMapSettings.mapType === text
text: modelData text: modelData
width: clearButton.width width: clearButton.width
exclusiveGroup: mapTypeButtonsExclusiveGroup exclusiveGroup: mapTypeButtonsExclusiveGroup
onClicked: { onClicked: {
QGroundControl.flightMapSettings.mapType = text QGroundControl.flightMapSettings.mapType = text
checked = true checked = true
dropButtonsExclusiveGroup.current = null dropButtonsExclusiveGroup.current = null
}
} }
} }
} }
}
QGCButton { QGCButton {
id: clearButton id: clearButton
text: qsTr("Clear Flight Trails") text: qsTr("Clear Flight Trails")
enabled: QGroundControl.multiVehicleManager.activeVehicle enabled: QGroundControl.multiVehicleManager.activeVehicle
onClicked: { onClicked: {
QGroundControl.multiVehicleManager.activeVehicle.clearTrajectoryPoints() QGroundControl.multiVehicleManager.activeVehicle.clearTrajectoryPoints()
dropButtonsExclusiveGroup.current = null dropButtonsExclusiveGroup.current = null
}
} }
} }
} }
} }
}
//-- Zoom Map In //-- Zoom Map In
RoundButton { RoundButton {
id: mapZoomPlus id: mapZoomPlus
visible: !ScreenTools.isTinyScreen && _mainIsMap anchors.topMargin: ScreenTools.defaultFontPixelHeight
buttonImage: "/qmlimages/ZoomPlus.svg" anchors.top: mapTypeButton.bottom
exclusiveGroup: dropButtonsExclusiveGroup anchors.left: mapTypeButton.left
z: QGroundControl.zOrderWidgets visible: !ScreenTools.isTinyScreen && _mainIsMap
lightBorders: isSatelliteMap buttonImage: "/qmlimages/ZoomPlus.svg"
onClicked: { exclusiveGroup: dropButtonsExclusiveGroup
if(_flightMap) z: QGroundControl.zOrderWidgets
_flightMap.zoomLevel += 0.5 lightBorders: isSatelliteMap
checked = false onClicked: {
} if(_flightMap)
_flightMap.zoomLevel += 0.5
checked = false
} }
}
//-- Zoom Map Out //-- Zoom Map Out
RoundButton { RoundButton {
id: mapZoomMinus id: mapZoomMinus
visible: !ScreenTools.isTinyScreen && _mainIsMap anchors.topMargin: ScreenTools.defaultFontPixelHeight
buttonImage: "/qmlimages/ZoomMinus.svg" anchors.top: mapZoomPlus.bottom
exclusiveGroup: dropButtonsExclusiveGroup anchors.left: mapZoomPlus.left
z: QGroundControl.zOrderWidgets visible: !ScreenTools.isTinyScreen && _mainIsMap
lightBorders: isSatelliteMap buttonImage: "/qmlimages/ZoomMinus.svg"
onClicked: { exclusiveGroup: dropButtonsExclusiveGroup
if(_flightMap) z: QGroundControl.zOrderWidgets
_flightMap.zoomLevel -= 0.5 lightBorders: isSatelliteMap
checked = false onClicked: {
} if(_flightMap)
_flightMap.zoomLevel -= 0.5
checked = false
} }
} }
......
src/MissionEditor/MissionEditor.qml
View file @ ffe6bfd4
This diff is collapsed.
src/QmlControls/DropButton.qml
View file @ ffe6bfd4
...@@ -15,6 +15,7 @@ Item { ...@@ -15,6 +15,7 @@ Item {
property int dropDirection: dropDown property int dropDirection: dropDown
property alias dropDownComponent: dropDownLoader.sourceComponent property alias dropDownComponent: dropDownLoader.sourceComponent
property real viewportMargins: 0 property real viewportMargins: 0
property real topMargin: parent.height - ScreenTools.availableHeight
property alias lightBorders: roundButton.lightBorders property alias lightBorders: roundButton.lightBorders
width: radius * 2 width: radius * 2
...@@ -35,7 +36,7 @@ Item { ...@@ -35,7 +36,7 @@ Item {
property real _viewportMaxLeft: -x + viewportMargins property real _viewportMaxLeft: -x + viewportMargins
property real _viewportMaxRight: parent.width - (viewportMargins * 2) - x property real _viewportMaxRight: parent.width - (viewportMargins * 2) - x
property real _viewportMaxTop: -y + viewportMargins property real _viewportMaxTop: -y + viewportMargins + topMargin
property real _viewportMaxBottom: parent.height - (viewportMargins * 2) - y property real _viewportMaxBottom: parent.height - (viewportMargins * 2) - y
// Set up ExclusiveGroup support. We use the checked property to drive visibility of drop down. // Set up ExclusiveGroup support. We use the checked property to drive visibility of drop down.
...@@ -53,8 +54,6 @@ Item { ...@@ -53,8 +54,6 @@ Item {
checked = false checked = false
} }
Component.onCompleted: _calcPositions()
function _calcPositions() { function _calcPositions() {
var dropComponentWidth = dropDownLoader.item.width var dropComponentWidth = dropDownLoader.item.width
var dropComponentHeight = dropDownLoader.item.height var dropComponentHeight = dropDownLoader.item.height
...@@ -161,6 +160,7 @@ Item { ...@@ -161,6 +160,7 @@ Item {
id: roundButton id: roundButton
radius: parent.width / 2 radius: parent.width / 2
onClicked: { onClicked: {
_calcPositions()
_root.clicked() _root.clicked()
} }
} }
...@@ -216,20 +216,11 @@ Item { ...@@ -216,20 +216,11 @@ Item {
Item { Item {
id: dropItemHolderRect id: dropItemHolderRect
//color: qgcPal.button
//radius: _dropCornerRadius
Loader { Loader {
id: dropDownLoader id: dropDownLoader
x: _dropMargin x: _dropMargin
y: _dropMargin y: _dropMargin
Connections {
target: dropDownLoader.item
onWidthChanged: _calcPositions()
onHeightChanged: _calcPositions()
}
} }
} }
} // Item - dropDownItem } // Item - dropDownItem
......
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