Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #1843

Browse Source 
d2d4c21 SettingsLog: fix TextArea layout, border, scrollbar (xiphon)
This commit is contained in:
luigi1111
2018-12-20 14:33:29 -06:00
parent d6981981d3 d2d4c21cde
commit d7f9ea7467
2 changed files with 76 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
components/DaemonConsole.qml
View File

@@ -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 {}
}
}