diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-12-20 14:33:29 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-12-20 14:33:29 -0600 |
| commit | d7f9ea746745fd4e5ed6517fba980f2a0f277401 (patch) | |
| tree | d40d6ab6c640f8637178b8b3650b759840cf7fc8 /components | |
| parent | d6981981d30f9a5e71f879dfe3b67792aa4db152 (diff) | |
| parent | d2d4c21cdef0aa23cbc882065cef83bb9abdc5f9 (diff) | |
| download | monzero-gui-d7f9ea746745fd4e5ed6517fba980f2a0f277401.tar.gz monzero-gui-d7f9ea746745fd4e5ed6517fba980f2a0f277401.tar.xz monzero-gui-d7f9ea746745fd4e5ed6517fba980f2a0f277401.zip | |
Merge pull request #1843
d2d4c21 SettingsLog: fix TextArea layout, border, scrollbar (xiphon)
Diffstat (limited to 'components')
| -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 {} } } |