From 7b1ea75744854386a4076d3131ba410038679523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Fri, 24 Apr 2020 08:12:43 -0300 Subject: [PATCH] Move log category to same flickable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/QmlControls/AppMessages.qml | 61 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppMessages.qml index d6cb59bbb..b6717b964 100644 --- a/src/QmlControls/AppMessages.qml +++ b/src/QmlControls/AppMessages.qml @@ -29,45 +29,44 @@ Item { Component { id: filtersDialogComponent QGCViewDialog { - ColumnLayout { + QGCFlickable { anchors.fill: parent - RowLayout { - spacing: ScreenTools.defaultFontPixelHeight / 2 - Layout.alignment: Qt.AlignVCenter - Layout.fillHeight: true - Layout.fillWidth: true - QGCLabel { - text: qsTr("Search:") - } + contentHeight: categoryColumn.height + clip: true - QGCTextField { - id: searchText - text: "" + ColumnLayout { + anchors.fill: parent + RowLayout { + spacing: ScreenTools.defaultFontPixelHeight / 2 + Layout.alignment: Qt.AlignVCenter + Layout.fillHeight: true Layout.fillWidth: true - enabled: true - } - QGCButton { - text: qsTr("Clear") - onClicked: searchText.text = "" - } - } + QGCLabel { + text: qsTr("Search:") + } - Row { - spacing: ScreenTools.defaultFontPixelHeight / 2 - QGCButton { - text: qsTr("Clear All") - onClicked: categoryRepeater.setAllLogs(false) - } - } + QGCTextField { + id: searchText + text: "" + Layout.fillWidth: true + enabled: true + } - QGCFlickable { - Layout.fillHeight: true - Layout.fillWidth: true + QGCButton { + text: qsTr("Clear") + onClicked: searchText.text = "" + } + } - contentHeight: categoryColumn.height - clip: true + Row { + spacing: ScreenTools.defaultFontPixelHeight / 2 + QGCButton { + text: qsTr("Clear All") + onClicked: categoryRepeater.setAllLogs(false) + } + } Column { id: categoryColumn -- 2.22.0