replace all nbsp in previews (#142)

arcan1s · Apr 18, 2020 · 5531952 · 5531952
1 parent e525cb4
commit 5531952
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
@@ -340,7 +340,8 @@ QString AWKeys::parsePattern(QString _pattern) const
 
     // main keys
     for (auto &key : m_foundKeys)
-        _pattern.replace(QString("$%1").arg(key), m_aggregator->formatter(m_values[key], key, true));
+        _pattern.replace(QString("$%1").arg(key),
+                         m_aggregator->formatter(m_values[key], key, true));
 
     // bars
     for (auto &bar : m_foundBars) {

diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp
@@ -55,7 +55,8 @@ void AWKeysAggregator::initFormatters()
 }
 
 
-QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const
+QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
+                                    bool replaceSpace) const
 {
     qCDebug(LOG_AW) << "Data" << _data << "for key" << _key;
 

diff --git a/sources/qml/AWExtensions.qml b/sources/qml/AWExtensions.qml
@@ -92,7 +92,7 @@ Row {
     }
 
     onShowMessage: {
-        compiledText.text = message.replace("&nbsp;", " ")
+        compiledText.text = message.split("&nbsp;").join(" ") // replaceAll lols
         compiledText.open()
     }
 }
diff --git a/sources/qml/AWTagSelector.qml b/sources/qml/AWTagSelector.qml
@@ -68,7 +68,7 @@ Row {
             // generate message
             var message = i18n("Tag: %1", tags.currentText)
             message += "<br>"
-            message += i18n("Value: %1", backend.valueByKey(tags.currentText))
+            message += i18n("Value: %1", backend.valueByKey(tags.currentText).split("&nbsp;").join(" "))
             message += "<br>"
             message += i18n("Info: %1", backend.infoByKey(tags.currentText))
             notifyBackend.sendNotification("tag", message)