zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Make Toolstrip flickable, fix maxHeight, fix bunch of margins

QGC4.4
DonLakeFlyer 5 years ago
parent
c9d3aa72df
commit
3081cb60df
5 changed files with 106 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/FlightDisplay/FlightDisplayView.qml
  2. 7
      src/FlightDisplay/FlightDisplayViewMap.qml
  3. 6
      src/FlightDisplay/FlightDisplayViewWidgets.qml
  4. 54
      src/PlanView/PlanView.qml
  5. 18
      src/QmlControls/ToolStrip.qml

19
src/FlightDisplay/FlightDisplayView.qml
Unescape View File

@ -54,6 +54,7 @@ Item { @@ -54,6 +54,7 @@ Item {
property real _pipSize: mainWindow.width * 0.2
property alias _guidedController: guidedActionsController
property alias _altitudeSlider: altitudeSlider
property real _toolsMargin: ScreenTools.defaultFontPixelWidth * 0.75
readonly property var _dynamicCameras: activeVehicle ? activeVehicle.dynamicCameras : null
readonly property bool _isCamera: _dynamicCameras ? _dynamicCameras.cameras.count > 0 : false
@ -357,7 +358,7 @@ Item { @@ -357,7 +358,7 @@ Item {
// Do anchors again after popup
anchors.left = _mapAndVideo.left
anchors.bottom = _mapAndVideo.bottom
anchors.margins = ScreenTools.defaultFontPixelHeight
anchors.margins = _toolsMargin
}
}
@ -366,7 +367,7 @@ Item { @@ -366,7 +367,7 @@ Item {
name: "pipMode"
PropertyChanges {
target: _flightVideo
anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.margins: _toolsMargin
}
PropertyChanges {
target: _flightVideoPipControl
@ -473,8 +474,8 @@ Item { @@ -473,8 +474,8 @@ Item {
Row {
id: singleMultiSelector
anchors.topMargin: ScreenTools.toolbarHeight + _margins
anchors.rightMargin: _margins
anchors.topMargin: ScreenTools.toolbarHeight + _toolsMargin
anchors.rightMargin: _toolsMargin
anchors.right: parent.right
spacing: ScreenTools.defaultFontPixelWidth
z: _mapAndVideo.z + 4
@ -496,7 +497,7 @@ Item { @@ -496,7 +497,7 @@ Item {
FlightDisplayViewWidgets {
id: flightDisplayViewWidgets
z: _mapAndVideo.z + 4
height: availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0) - (ScreenTools.defaultFontPixelHeight * 0.5)
height: availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _toolsMargin : 0) - _toolsMargin
anchors.left: parent.left
anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right
anchors.bottom: parent.bottom
@ -519,7 +520,7 @@ Item { @@ -519,7 +520,7 @@ Item {
}
MultiVehicleList {
anchors.margins: _margins
anchors.margins: _toolsMargin
anchors.top: singleMultiSelector.bottom
anchors.right: parent.right
anchors.bottom: parent.bottom
@ -554,14 +555,14 @@ Item { @@ -554,14 +555,14 @@ Item {
visible: (activeVehicle ? activeVehicle.guidedModeSupported : true) && !QGroundControl.videoManager.fullScreen
id: toolStrip
anchors.leftMargin: isInstrumentRight() ? ScreenTools.defaultFontPixelWidth * 2 : undefined
anchors.leftMargin: isInstrumentRight() ? _toolsMargin : undefined
anchors.left: isInstrumentRight() ? _mapAndVideo.left : undefined
anchors.rightMargin:isInstrumentRight() ? undefined : ScreenTools.defaultFontPixelWidth
anchors.right: isInstrumentRight() ? undefined : _mapAndVideo.right
anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.5
anchors.topMargin: _toolsMargin
anchors.top: parent.top
z: _mapAndVideo.z + 4
maxHeight: (_flightVideo.visible ? _flightVideo.y : parent.height) - toolStrip.y
maxHeight: parent.height - toolStrip.y + (_flightVideo.visible ? (_flightVideo.y - parent.height) : 0)
property bool _anyActionAvailable: _guidedController.showStartMission || _guidedController.showResumeMission || _guidedController.showChangeAlt || _guidedController.showLandAbort
property var _actionModel: [

7
src/FlightDisplay/FlightDisplayViewMap.qml
Unescape View File

@ -478,12 +478,11 @@ FlightMap { @@ -478,12 +478,11 @@ FlightMap {
MapScale {
id: mapScale
anchors.right: parent.right
anchors.margins: ScreenTools.defaultFontPixelHeight * (0.33)
anchors.topMargin: ScreenTools.defaultFontPixelHeight * (0.33) + state === "bottomMode" ? 0 : ScreenTools.toolbarHeight
anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * (0.33)
anchors.margins: _toolsMargin
anchors.topMargin: _toolsMargin + state === "bottomMode" ? 0 : ScreenTools.toolbarHeight
mapControl: flightMap
buttonsOnLeft: false
visible: !ScreenTools.isTinyScreen && QGroundControl.corePlugin.options.enableMapScale
visible: !ScreenTools.isTinyScreen && QGroundControl.corePlugin.options.enableMapScale && mainIsMap
state: "bottomMode"
states: [
State {

6
src/FlightDisplay/FlightDisplayViewWidgets.qml
Unescape View File

@ -170,8 +170,8 @@ Item { @@ -170,8 +170,8 @@ Item {
id: instrumentsColumn
spacing: ScreenTools.defaultFontPixelHeight * 0.25
anchors.top: parent.top
anchors.topMargin: QGroundControl.corePlugin.options.instrumentWidget ? (QGroundControl.corePlugin.options.instrumentWidget.widgetTopMargin + (ScreenTools.defaultFontPixelHeight * 0.5)) : 0
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
anchors.topMargin: QGroundControl.corePlugin.options.instrumentWidget ? (QGroundControl.corePlugin.options.instrumentWidget.widgetTopMargin + _toolsMargin) : 0
anchors.margins: _toolsMargin
anchors.right: parent.right
//-------------------------------------------------------
// Airmap Airspace Control
@ -185,7 +185,7 @@ Item { @@ -185,7 +185,7 @@ Item {
//-- Instrument Panel
Loader {
id: instrumentsLoader
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
anchors.margins: _toolsMargin
property real maxHeight: widgetRoot ? widgetRoot.height - instrumentsColumn.y - airspaceControl.height - (ScreenTools.defaultFontPixelHeight * 4) : 0
states: [
State {

54
src/PlanView/PlanView.qml
Unescape View File

@ -34,7 +34,7 @@ Item { @@ -34,7 +34,7 @@ Item {
readonly property int _decimalPlaces: 8
readonly property real _margin: ScreenTools.defaultFontPixelHeight * 0.5
readonly property real _toolsTopMargin: ScreenTools.defaultFontPixelHeight * 0.5
readonly property real _toolsMargin: ScreenTools.defaultFontPixelWidth * 0.75
readonly property real _radius: ScreenTools.defaultFontPixelWidth * 0.5
readonly property real _rightPanelWidth: Math.min(parent.width / 3, ScreenTools.defaultFontPixelWidth * 30)
readonly property var _defaultVehicleCoordinate: QtPositioning.coordinate(37.803784, -122.462276)
@ -367,7 +367,7 @@ Item { @@ -367,7 +367,7 @@ Item {
planView: true
// This is the center rectangle of the map which is not obscured by tools
property rect centerViewport: Qt.rect(_leftToolWidth + _margin, _toolsTopMargin, editorMap.width - _leftToolWidth - _rightToolWidth - (_margin * 2), mapScale.y - _margin - _toolsTopMargin)
property rect centerViewport: Qt.rect(_leftToolWidth + _margin, _toolsMargin, editorMap.width - _leftToolWidth - _rightToolWidth - (_margin * 2), mapScale.y - _margin - _toolsMargin)
property real _leftToolWidth: toolStrip.x + toolStrip.width
property real _rightToolWidth: rightPanel.width + rightPanel.anchors.rightMargin
@ -536,12 +536,11 @@ Item { @@ -536,12 +536,11 @@ Item {
// Left tool strip
ToolStrip {
id: toolStrip
anchors.leftMargin: ScreenTools.defaultFontPixelWidth * 2
anchors.margins: _toolsMargin
anchors.left: parent.left
anchors.topMargin: _toolsTopMargin
anchors.top: parent.top
z: QGroundControl.zOrderWidgets
maxHeight: mapScale.y - toolStrip.y
maxHeight: parent.height - toolStrip.y
readonly property int flyButtonIndex: 0
readonly property int fileButtonIndex: 1
@ -638,12 +637,17 @@ Item { @@ -638,12 +637,17 @@ Item {
}
break
case roiButtonIndex:
if (_addROIOnClick) {
allAddClickBoolsOff()
setChecked(index, false)
} else {
allAddClickBoolsOff()
if (_missionController.isROIActive) {
insertCancelROIAfterCurrent()
} else {
_addROIOnClick = checked
}
}
break
case patternButtonIndex:
allAddClickBoolsOff()
@ -673,13 +677,13 @@ Item { @@ -673,13 +677,13 @@ Item {
opacity: planExpanded.visible ? 0.2 : 0
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.rightMargin: ScreenTools.defaultFontPixelWidth
anchors.rightMargin: _toolsMargin
}
//-------------------------------------------------------
// Right Panel Controls
Item {
anchors.fill: rightPanel
anchors.topMargin: _toolsTopMargin
anchors.topMargin: _toolsMargin
DeadMouseArea {
anchors.fill: parent
}
@ -857,28 +861,15 @@ Item { @@ -857,28 +861,15 @@ Item {
}
}
MapScale {
id: mapScale
anchors.margins: ScreenTools.defaultFontPixelHeight * (0.66)
anchors.bottom: waypointValuesDisplay.visible ? waypointValuesDisplay.top : parent.bottom
anchors.left: parent.left
mapControl: editorMap
buttonsOnLeft: true
terrainButtonVisible: _editingLayer === _layerMission
visible: _toolStripBottom < y
terrainButtonChecked: waypointValuesDisplay.visible
onTerrainButtonClicked: waypointValuesDisplay.toggleVisible()
}
MissionItemStatus {
id: waypointValuesDisplay
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.margins: _toolsMargin
anchors.left: toolStrip.right
anchors.bottom: mapScale.top
height: ScreenTools.defaultFontPixelHeight * 7
maxWidth: parent.width - rightPanel.width - x
anchors.bottom: parent.bottom
maxWidth: rightPanel.x - x - anchors.margins
missionItems: _missionController.visualItems
visible: _internalVisible && _editingLayer === _layerMission && (_toolStripBottom + mapScale.height) < y && QGroundControl.corePlugin.options.showMissionStatus
visible: _internalVisible && _editingLayer === _layerMission && QGroundControl.corePlugin.options.showMissionStatus
property bool _internalVisible: false
@ -886,6 +877,19 @@ Item { @@ -886,6 +877,19 @@ Item {
_internalVisible = !_internalVisible
}
}
MapScale {
id: mapScale
anchors.margins: _toolsMargin
anchors.bottom: parent.bottom
anchors.left: toolStrip.right
mapControl: editorMap
buttonsOnLeft: true
terrainButtonVisible: _editingLayer === _layerMission
terrainButtonChecked: waypointValuesDisplay.visible
onTerrainButtonClicked: waypointValuesDisplay.toggleVisible()
}
}
Component {

18
src/QmlControls/ToolStrip.qml
Unescape View File

@ -19,7 +19,7 @@ Rectangle { @@ -19,7 +19,7 @@ Rectangle {
id: _root
color: qgcPal.globalTheme === QGCPalette.Light ? QGroundControl.corePlugin.options.toolbarBackgroundLight : QGroundControl.corePlugin.options.toolbarBackgroundDark
width: _idealWidth < repeater.contentWidth ? repeater.contentWidth : _idealWidth
height: toolStripColumn.height + (toolStripColumn.anchors.margins * 2)
height: Math.min(maxHeight, toolStripColumn.height + (toolStripColumn.anchors.margins * 2))
radius: ScreenTools.defaultFontPixelWidth / 2
property alias model: repeater.model
@ -51,12 +51,23 @@ Rectangle { @@ -51,12 +51,23 @@ Rectangle {
buttons: toolStripColumn.children
}
Column {
id: toolStripColumn
DeadMouseArea {
anchors.fill: parent
}
QGCFlickable {
anchors.margins: ScreenTools.defaultFontPixelWidth * 0.4
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
height: parent.height
contentHeight: toolStripColumn.height
flickableDirection: Flickable.VerticalFlick
Column {
id: toolStripColumn
anchors.left: parent.left
anchors.right: parent.right
spacing: ScreenTools.defaultFontPixelWidth * 0.25
Repeater {
@ -97,6 +108,7 @@ Rectangle { @@ -97,6 +108,7 @@ Rectangle {
}
}
}
}
DropPanel {
id: dropPanel

Write Preview
Loading…
Cancel
Save