Skip to content

Q
qgroundcontrol
Commit e984fd95 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Fix conflict mess

parent bc60a434
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 76 deletions
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @ e984fd95
...@@ -155,11 +155,6 @@ Item { ...@@ -155,11 +155,6 @@ Item {
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: QGroundControl.corePlugin.options.instrumentWidget.widgetTopMargin + (ScreenTools.defaultFontPixelHeight * 0.5) anchors.topMargin: QGroundControl.corePlugin.options.instrumentWidget.widgetTopMargin + (ScreenTools.defaultFontPixelHeight * 0.5)
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
//-- Instrument Panel
Loader {
id: instrumentsLoader
anchors.margins: ScreenTools.defaultFontPixelHeight / 2
anchors.right: parent.right anchors.right: parent.right
//------------------------------------------------------- //-------------------------------------------------------
// Airmap Airspace Control // Airmap Airspace Control
...@@ -177,77 +172,74 @@ Item { ...@@ -177,77 +172,74 @@ Item {
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
property var qgcView: widgetRoot.qgcView property var qgcView: widgetRoot.qgcView
property real maxHeight: widgetRoot ? widgetRoot.height - instrumentsColumn.y - airspaceControl.height - (ScreenTools.defaultFontPixelHeight * 4) : 0 property real maxHeight: widgetRoot ? widgetRoot.height - instrumentsColumn.y - airspaceControl.height - (ScreenTools.defaultFontPixelHeight * 4) : 0
} states: [
z: QGroundControl.zOrderWidgets State {
property var qgcView: _root.qgcView name: "topRightMode"
property real maxHeight:parent.height - (anchors.margins * 2) AnchorChanges {
states: [ target: instrumentsLoader
State { anchors.verticalCenter: undefined
name: "topRightMode" anchors.bottom: undefined
AnchorChanges { anchors.top: _root ? _root.top : undefined
target: instrumentsLoader anchors.right: _root ? _root.right : undefined
anchors.verticalCenter: undefined anchors.left: undefined
anchors.bottom: undefined }
anchors.top: _root ? _root.top : undefined },
anchors.right: _root ? _root.right : undefined State {
anchors.left: undefined name: "centerRightMode"
} AnchorChanges {
}, target: instrumentsLoader
State { anchors.top: undefined
name: "centerRightMode" anchors.bottom: undefined
AnchorChanges { anchors.verticalCenter: _root ? _root.verticalCenter : undefined
target: instrumentsLoader anchors.right: _root ? _root.right : undefined
anchors.top: undefined anchors.left: undefined
anchors.bottom: undefined }
anchors.verticalCenter: _root ? _root.verticalCenter : undefined },
anchors.right: _root ? _root.right : undefined State {
anchors.left: undefined name: "bottomRightMode"
} AnchorChanges {
}, target: instrumentsLoader
State { anchors.top: undefined
name: "bottomRightMode" anchors.verticalCenter: undefined
AnchorChanges { anchors.bottom: _root ? _root.bottom : undefined
target: instrumentsLoader anchors.right: _root ? _root.right : undefined
anchors.top: undefined anchors.left: undefined
anchors.verticalCenter: undefined }
anchors.bottom: _root ? _root.bottom : undefined },
anchors.right: _root ? _root.right : undefined State {
anchors.left: undefined name: "topLeftMode"
} AnchorChanges {
}, target: instrumentsLoader
State { anchors.verticalCenter: undefined
name: "topLeftMode" anchors.bottom: undefined
AnchorChanges { anchors.top: _root ? _root.top : undefined
target: instrumentsLoader anchors.right: undefined
anchors.verticalCenter: undefined anchors.left: _root ? _root.left : undefined
anchors.bottom: undefined }
anchors.top: _root ? _root.top : undefined },
anchors.right: undefined State {
anchors.left: _root ? _root.left : undefined name: "centerLeftMode"
AnchorChanges {
target: instrumentsLoader
anchors.top: undefined
anchors.bottom: undefined
anchors.verticalCenter: _root ? _root.verticalCenter : undefined
anchors.right: undefined
anchors.left: _root ? _root.left : undefined
}
},
State {
name: "bottomLeftMode"
AnchorChanges {
target: instrumentsLoader
anchors.top: undefined
anchors.verticalCenter: undefined
anchors.bottom: _root ? _root.bottom : undefined
anchors.right: undefined
anchors.left: _root ? _root.left : undefined
}
} }
}, ]
State { }
name: "centerLeftMode"
AnchorChanges {
target: instrumentsLoader
anchors.top: undefined
anchors.bottom: undefined
anchors.verticalCenter: _root ? _root.verticalCenter : undefined
anchors.right: undefined
anchors.left: _root ? _root.left : undefined
}
},
State {
name: "bottomLeftMode"
AnchorChanges {
target: instrumentsLoader
anchors.top: undefined
anchors.verticalCenter: undefined
anchors.bottom: _root ? _root.bottom : undefined
anchors.right: undefined
anchors.left: _root ? _root.left : undefined
}
}
]
} }
} }
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