From 02a28325a89dec1c5d57ff0b3ee6ef3663cbd8be Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Tue, 2 Jun 2020 16:03:50 +0200 Subject: [PATCH] Show broken encryption icon only in non-empty folders This should address Tobias' concerns regarding the icon being misleading. Now we basically do the following inside an encrypted folder parent: * encrypted folders get the encrypted icon; * non-encrypted empty folders get the regular folder icon; * non-encrypted non-empty folders get the broken encryption icon. Signed-off-by: Kevin Ottens --- src/gui/folderstatusmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index 52370bfa5..8d0c2e881 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -158,7 +158,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const case Qt::DecorationRole: if (_accountState->account()->e2e()->isFolderEncrypted(x._path)) { return QIcon(QLatin1String(":/client/theme/lock-https.svg")); - } else if (_accountState->account()->e2e()->isAnyParentFolderEncrypted(x._path)) { + } else if (x._size > 0 && _accountState->account()->e2e()->isAnyParentFolderEncrypted(x._path)) { return QIcon(QLatin1String(":/client/theme/lock-broken.svg")); } return QFileIconProvider().icon(x._isExternal ? QFileIconProvider::Network : QFileIconProvider::Folder);