marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

components: Fix MarqueeLabel behaviour with new line characters

Browse source
This commit is contained in:
Devin Lin 2022-10-27 20:09:46 -04:00
parent 06de6e416e
commit f4b15f922f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/mobileshell/qml/components/MarqueeLabel.qml
View file

@ -14,16 +14,17 @@ PlasmaComponents.Label {
id: root id: root
required property string inputText required property string inputText
readonly property string filteredText: inputText.replace(/\n/g, ' ') // remove new line characters
property int interval: PlasmaCore.Units.longDuration property int interval: PlasmaCore.Units.longDuration
readonly property int charactersOverflow: Math.ceil((txtMeter.advanceWidth - root.width) / (txtMeter.advanceWidth / inputText.length)) readonly property int charactersOverflow: Math.ceil((txtMeter.advanceWidth - root.width) / (txtMeter.advanceWidth / filteredText.length))
property int step: 0 property int step: 0
TextMetrics { TextMetrics {
id: txtMeter id: txtMeter
font: root.font font: root.font
text: inputText text: filteredText
} }
Timer { Timer {
@ -42,7 +43,7 @@ PlasmaComponents.Label {
paused = false; paused = false;
} }
} else { } else {
step = (step + 1) % inputText.length; step = (step + 1) % filteredText.length;
if (step === charactersOverflow) { if (step === charactersOverflow) {
interval = PlasmaCore.Units.veryLongDuration * 3; interval = PlasmaCore.Units.veryLongDuration * 3;
paused = true; paused = true;
@ -57,5 +58,5 @@ PlasmaComponents.Label {
} }
} }
text: inputText.substring(step, step + inputText.length - charactersOverflow) text: filteredText.substring(step, step + filteredText.length - charactersOverflow)
} }