Wrap <pre> tag.
This commit is contained in:
parent
348a8186fd
commit
948da868a9
|
@ -84,7 +84,7 @@ Rectangle {
|
||||||
}
|
}
|
||||||
|
|
||||||
Drawer {
|
Drawer {
|
||||||
width: Math.max(root.width, 360)
|
width: Math.max(root.width, 400)
|
||||||
height: root.height
|
height: root.height
|
||||||
|
|
||||||
id: drawer
|
id: drawer
|
||||||
|
@ -466,6 +466,13 @@ Rectangle {
|
||||||
onCheckedChanged: MSettings.showTray = checked
|
onCheckedChanged: MSettings.showTray = checked
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Switch {
|
||||||
|
text: "Enable timeline background"
|
||||||
|
checked: MSettings.enableTimelineBackground
|
||||||
|
|
||||||
|
onCheckedChanged: MSettings.enableTimelineBackground = checked
|
||||||
|
}
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
|
|
|
@ -44,9 +44,9 @@ Item {
|
||||||
Image {
|
Image {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
visible: currentRoom
|
visible: currentRoom && MSettings.enableTimelineBackground
|
||||||
|
|
||||||
source: MSettings.darkTheme ? "qrc:/assets/img/roompanel-dark.svg" : "qrc:/assets/img/roompanel.svg"
|
source: MSettings.timelineBackground || MSettings.darkTheme ? "qrc:/assets/img/roompanel-dark.svg" : "qrc:/assets/img/roompanel.svg"
|
||||||
fillMode: Image.PreserveAspectCrop
|
fillMode: Image.PreserveAspectCrop
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,4 +9,7 @@ Settings {
|
||||||
property bool showTray: true
|
property bool showTray: true
|
||||||
|
|
||||||
property bool darkTheme
|
property bool darkTheme
|
||||||
|
|
||||||
|
property bool enableTimelineBackground: true
|
||||||
|
property string timelineBackground
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,6 +45,8 @@ QString eventToString(const BaseEventT& evt,
|
||||||
"</b>");
|
"</b>");
|
||||||
pos += userPillRegExp.matchedLength();
|
pos += userPillRegExp.matchedLength();
|
||||||
}
|
}
|
||||||
|
static const QRegExp codePillRegExp("<pre>(.*)</pre>");
|
||||||
|
formattedStr.replace(codePillRegExp, "<i>\\1</i>");
|
||||||
return formattedStr;
|
return formattedStr;
|
||||||
}
|
}
|
||||||
if (e.hasFileContent()) {
|
if (e.hasFileContent()) {
|
||||||
|
|
Loading…
Reference in New Issue