monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-02-03 11:36:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SettingsLog: fix TextArea layout, border, scrollbar

Browse source
This commit is contained in:
xiphon 2018-12-19 04:54:43 +00:00
parent bac833c1dd
commit d2d4c21cde
2 changed files with 76 additions and 88 deletions
Show stats 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 anchors.margins: 35 * scaleRatio
spacing: 20 * scaleRatio spacing: 20 * scaleRatio
RowLayout { Item {
id: content
Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true
Rectangle {
anchors.fill: parent
color: "transparent"
border.color: MoneroComponents.Style.inputBorderColorActive
border.width: 1
radius: 4
}
Flickable { Flickable {
id: flickable id: flickable
@ -101,20 +108,12 @@ Window {
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
selectByMouse: true selectByMouse: true
selectByKeyboard: true selectByKeyboard: true
anchors.fill: parent font.family: MoneroComponents.Style.defaultFontColor
font.family: "Ariel"
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
selectionColor: MoneroComponents.Style.dimmedFontColor selectionColor: MoneroComponents.Style.dimmedFontColor
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
readOnly: true 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){ function logCommand(msg){
msg = log_color(msg, "lime"); msg = log_color(msg, "lime");
textArea.append(msg); textArea.append(msg);
@ -156,15 +155,7 @@ Window {
} }
} }
ScrollBar.vertical: ScrollBar { 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
}
} }
} }

35
pages/settings/SettingsLog.qml
View file

@ -138,30 +138,34 @@ Rectangle {
text: qsTr("Daemon log") + translationManager.emptyString text: qsTr("Daemon log") + translationManager.emptyString
} }
Flickable { Item {
id: flickable Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 240 * scaleRatio Layout.preferredHeight: 240 * scaleRatio
Rectangle {
anchors.fill: parent
color: "transparent"
border.color: MoneroComponents.Style.inputBorderColorActive
border.width: 1
radius: 4
}
Flickable {
id: flickable
anchors.fill: parent
TextArea.flickable: TextArea { TextArea.flickable: TextArea {
id : consoleArea id : consoleArea
anchors.fill: parent
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
selectionColor: MoneroComponents.Style.dimmedFontColor selectionColor: MoneroComponents.Style.dimmedFontColor
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
selectByMouse: true selectByMouse: true
selectByKeyboard: true selectByKeyboard: true
font.family: "Ariel" font.family: MoneroComponents.Style.defaultFontColor
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
readOnly: true 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){ function logCommand(msg){
msg = log_color(msg, "lime"); msg = log_color(msg, "lime");
consoleArea.append(msg); consoleArea.append(msg);
@ -203,14 +207,7 @@ Rectangle {
} }
} }
ScrollBar.vertical: ScrollBar { 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
} }
} }