From d2d4c21cdef0aa23cbc882065cef83bb9abdc5f9 Mon Sep 17 00:00:00 2001
From: xiphon <xiphon@protonmail.com>
Date: Wed, 19 Dec 2018 04:54:43 +0000
Subject: SettingsLog: fix TextArea layout, border, scrollbar

---
 components/DaemonConsole.qml | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'components')

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 {}
             }
         }
 
-- 
cgit v1.2.3