diff options
| author | xiphon <xiphon@protonmail.com> | 2018-12-19 04:54:43 +0000 |
|---|---|---|
| committer | xiphon <xiphon@protonmail.com> | 2018-12-19 08:06:52 +0300 |
| commit | d2d4c21cdef0aa23cbc882065cef83bb9abdc5f9 (patch) | |
| tree | 7a04dd8fed8f9026a2dded376ba031bd195a1097 /components/DaemonConsole.qml | |
| parent | bac833c1dd95666e159406f290ad334decee2810 (diff) | |
| download | monzero-gui-d2d4c21cdef0aa23cbc882065cef83bb9abdc5f9.tar.gz monzero-gui-d2d4c21cdef0aa23cbc882065cef83bb9abdc5f9.tar.xz monzero-gui-d2d4c21cdef0aa23cbc882065cef83bb9abdc5f9.zip | |
SettingsLog: fix TextArea layout, border, scrollbar
Diffstat (limited to 'components/DaemonConsole.qml')
| -rw-r--r-- | components/DaemonConsole.qml | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/components/DaemonConsole.qml b/components/DaemonConsole.qml index 3efd024b..bed7dc39 100644 --- a/components/DaemonConsole.qml +++ b/components/DaemonConsole.qml @@ -87,10 +87,17 @@ Window { anchors.margins: 35 * scaleRatio spacing: 20 * scaleRatio - RowLayout { - id: content - Layout.fillWidth: true + Item { Layout.fillHeight: true + Layout.fillWidth: true + + Rectangle { + anchors.fill: parent + color: "transparent" + border.color: MoneroComponents.Style.inputBorderColorActive + border.width: 1 + radius: 4 + } Flickable { id: flickable @@ -101,20 +108,12 @@ Window { textFormat: TextEdit.RichText selectByMouse: true selectByKeyboard: true - anchors.fill: parent - font.family: "Ariel" + font.family: MoneroComponents.Style.defaultFontColor font.pixelSize: 14 * scaleRatio color: MoneroComponents.Style.defaultFontColor selectionColor: MoneroComponents.Style.dimmedFontColor wrapMode: TextEdit.Wrap readOnly: true - background: Rectangle { - color: "transparent" - anchors.fill: parent - border.color: Qt.rgba(255, 255, 255, 0.25); - border.width: 1 - radius: 4 - } function logCommand(msg){ msg = log_color(msg, "lime"); textArea.append(msg); @@ -156,15 +155,7 @@ Window { } } - ScrollBar.vertical: ScrollBar { - // TODO: scrollbar always visible is buggy. - // QT 5.9 introduces `policy: ScrollBar.AlwaysOn` - contentItem.opacity: 1 - anchors.top: flickable.top - anchors.left: flickable.right - anchors.leftMargin: 10 * scaleRatio - anchors.bottom: flickable.bottom - } + ScrollBar.vertical: ScrollBar {} } } |