Merge branch 'repeat2' into 'master'

All new features

See merge request kde/rolisteam-diceparser!4

1 files changed, 13 insertions, 4 deletions

diff --git a/highlightdice.cpp b/highlightdice.cpp
index 58d9eec..d180a8d 100644
--- a/highlightdice.cpp
+++ b/highlightdice.cpp
@@ -78,8 +78,17 @@ void HighLightDice::setFaces(const quint64& faces)
 
 QString HighLightDice::getResultString() const
 {
-    QStringList list;
-    std::transform(std::begin(m_result), std::end(m_result), std::back_inserter(list),
-                   [](qint64 value) { return QString::number(value); });
-    return list.join(",");
+    if(m_result.size() == 1)
+    {
+        return QString::number(m_result.first());
+    }
+    else
+    {
+        QStringList list;
+        std::transform(std::begin(m_result), std::end(m_result), std::back_inserter(list),
+                       [](qint64 value) { return QString::number(value); });
+
+        auto totalScore= std::accumulate(std::begin(m_result), std::end(m_result), 0);
+        return QStringLiteral("%2 [%1]").arg(list.join(",")).arg(totalScore);
+    }
 }