From 254ea5accb25cf3218af8df7da6471d10bceee5b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 2 Apr 2016 10:54:46 -0500 Subject: [PATCH] QML UI: redo application log page This makes things wrap and scroll correctly again for me Signed-off-by: Dirk Hohndel --- qt-mobile/qml/Log.qml | 49 +++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/qt-mobile/qml/Log.qml b/qt-mobile/qml/Log.qml index 3b9520f7b..d617901de 100644 --- a/qt-mobile/qml/Log.qml +++ b/qt-mobile/qml/Log.qml @@ -15,37 +15,26 @@ Kirigami.ScrollablePage { objectName: "Log" title: "Application Log" -/* this can be done by hitting the back key - contextualActions: [ - Action { - text: "Close Log" - iconName: "dialog-cancel" - onTriggered: { - stackView.pop() - contextDrawer.close() - } - } - ] - */ + property int pageWidth: subsurfaceTheme.columnWidth - Kirigami.Units.smallSpacing - Flickable { - id: logFlick - anchors.fill: parent - contentHeight: logContent.height - clip: true - ColumnLayout { - width: logFlick.width - spacing: Kirigami.Units.smallSpacing - Kirigami.Heading { - text: "Application Log" - } - Kirigami.Label { - id: logContent - Layout.preferredWidth: parent.width - Layout.maximumWidth: parent.width - wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere - text: manager.logText - } + ColumnLayout { + width: pageWidth + spacing: Kirigami.Units.smallSpacing + Kirigami.Heading { + text: "Application Log" + } + Kirigami.Label { + id: logContent + width: parent.width + Layout.preferredWidth: parent.width + Layout.maximumWidth: parent.width + wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere + text: manager.logText + } + Rectangle { + color: "transparent" + height: Kirigami.Units.gridUnit * 2 + width: pageWidth } } }