Browse Source

Fix filter dialog clipping (#9152)

QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
e6e276512d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 28
      src/QmlControls/AppMessages.qml

28
src/QmlControls/AppMessages.qml

@ -27,25 +27,18 @@ Item {
property bool loaded: false property bool loaded: false
Component { Component {
id: filtersDialogComponent id: filtersPopupDialog
QGCViewDialog {
QGCFlickable {
anchors.fill: parent
contentHeight: categoryColumn.height QGCPopupDialog {
clip: true title: qsTr("Turn on logging categories")
buttons: StandardButton.Close
ColumnLayout { ColumnLayout {
anchors.fill: parent
RowLayout { RowLayout {
spacing: ScreenTools.defaultFontPixelHeight / 2 spacing: ScreenTools.defaultFontPixelHeight / 2
Layout.alignment: Qt.AlignVCenter
Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
QGCLabel { QGCLabel { text: qsTr("Search:") }
text: qsTr("Search:")
}
QGCTextField { QGCTextField {
id: searchText id: searchText
@ -60,17 +53,10 @@ Item {
} }
} }
Row {
spacing: ScreenTools.defaultFontPixelHeight / 2
QGCButton { QGCButton {
text: qsTr("Clear All") text: qsTr("Clear All")
onClicked: categoryRepeater.setAllLogs(false) onClicked: categoryRepeater.setAllLogs(false)
} }
}
Column {
id: categoryColumn
spacing: ScreenTools.defaultFontPixelHeight / 2
Repeater { Repeater {
id: categoryRepeater id: categoryRepeater
@ -100,8 +86,6 @@ Item {
} }
} }
} }
}
}
Item { Item {
id: panel id: panel
@ -225,7 +209,7 @@ Item {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Set Logging") text: qsTr("Set Logging")
onClicked: mainWindow.showComponentDialog(filtersDialogComponent, qsTr("Turn on logging categories"), mainWindow.showDialogDefaultWidth, StandardButton.Close) onClicked: mainWindow.showPopupDialogFromComponent(filtersPopupDialog)
} }
} }
} }

Loading…
Cancel
Save