Skip to content

Q
qgroundcontrol
Commit ef712aff authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

parent 423df36b
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 14 deletions
src/AutoPilotPlugins/Common/SetupPage.qml
View file @ ef712aff
...@@ -51,14 +51,13 @@ Item { ...@@ -51,14 +51,13 @@ Item {
QGCFlickable { QGCFlickable {
anchors.fill: parent anchors.fill: parent
contentWidth: pageLoader.x + pageLoader.item.width contentWidth: Math.max(availableWidth, pageLoader.x + pageLoader.item.width)
contentHeight: pageLoader.y + pageLoader.item.height contentHeight: Math.max(availableHeight, pageLoader.y + pageLoader.item.height)
clip: true clip: true
RowLayout { RowLayout {
id: headingRow id: headingRow
anchors.left: parent.left width: availableWidth
anchors.right: parent.right
spacing: _margins spacing: _margins
layoutDirection: Qt.RightToLeft layoutDirection: Qt.RightToLeft
...@@ -68,22 +67,22 @@ Item { ...@@ -68,22 +67,22 @@ Item {
visible: showAdvanced visible: showAdvanced
} }
Column { ColumnLayout {
spacing: _margins spacing: _margins
Layout.fillWidth: true Layout.fillWidth: true
QGCLabel { QGCLabel {
font.pointSize: ScreenTools.largeFontPointSize Layout.fillWidth: true
text: !setupView.enabled ? _pageTitle + "<font color=\"red\">" + qsTr(" (Disabled while the vehicle is %1)").arg(_disableReason) + "</font>" : _pageTitle font.pointSize: ScreenTools.largeFontPointSize
visible: !ScreenTools.isShortScreen text: !setupView.enabled ? _pageTitle + "<font color=\"red\">" + qsTr(" (Disabled while the vehicle is %1)").arg(_disableReason) + "</font>" : _pageTitle
visible: !ScreenTools.isShortScreen
} }
QGCLabel { QGCLabel {
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right wrapMode: Text.WordWrap
wrapMode: Text.WordWrap text: pageDescription
text: pageDescription visible: pageDescription !== "" && !ScreenTools.isShortScreen
visible: pageDescription !== "" && !ScreenTools.isShortScreen
} }
} }
} }
...@@ -96,7 +95,7 @@ Item { ...@@ -96,7 +95,7 @@ Item {
// to be disabled // to be disabled
Rectangle { Rectangle {
visible: !setupView.enabled visible: !setupView.enabled
anchors.fill: pageLoader anchors.fill: parent
color: "black" color: "black"
opacity: 0.5 opacity: 0.5
} }
......
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