Merge pull request #7706 from nextcloud/backport/7679/stable-3.15

[stable-3.15] Bugfix/elidedtext
nextcloud · Jan 2, 2025 · 0db44c8 · 0db44c8
2 parents 9436f73 + 5932198
commit 0db44c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
@@ -2046,7 +2046,7 @@ Result<void, QString> FolderMan::unsupportedConfiguration(const QString &path) c
     if (numberOfSyncJournals(path) > 1) {
         return tr("The folder %1 is linked to multiple accounts.\n"
                   "This setup can cause data loss and it is no longer supported.\n"
-                  "To resolve this issue: please remove %1 from one of the accounts and create a new sync folder.\n\n"
+                  "To resolve this issue: please remove %1 from one of the accounts and create a new sync folder.\n"
                   "For advanced users: this issue might be related to multiple sync database files found in one folder. Please check %1 for outdated and unused .sync_*.db files and remove them.")
             .arg(path);
     }

diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
@@ -273,7 +273,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
             subFm.height());
 
         for (const auto &eText : texts) {
-            painter->drawText(QStyle::visualRect(option.direction, option.rect, textRect), textAlign, subFm.elidedText(eText, Qt::ElideLeft, textRect.width()));
+            painter->drawText(QStyle::visualRect(option.direction, option.rect, textRect), textAlign, subFm.elidedText(eText, Qt::ElideRight, textRect.width()));
             textRect.translate(0, textRect.height());
         }
         // restore previous state