From 306e7e24938c52e1af09bcf3e88945828cbfcb34 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heiko.becker@kde.org>
Date: Mon, 3 Jan 2022 22:19:47 +0100
Subject: GIT_SILENT Update Appstream for new release

---
 src/org.kde.dolphin.appdata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index 3d9a08191..59a2d59c9 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -413,9 +413,9 @@
     <binary>dolphin</binary>
   </provides>
   <releases>
+    <release version="21.12.1" date="2022-01-06"/>
     <release version="21.12.0" date="2021-12-09"/>
     <release version="21.08.3" date="2021-11-04"/>
     <release version="21.08.2" date="2021-10-07"/>
-    <release version="21.08.1" date="2021-09-02"/>
   </releases>
 </component>
-- 
cgit v1.3


From d04cc677861ee446c001e80cb13c1eb8a5e0ebe6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 24 Jan 2022 02:10:57 +0000
Subject: GIT_SILENT made messages (after extraction)

---
 src/org.kde.dolphin.appdata.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index 59a2d59c9..2aac78253 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -393,6 +393,7 @@
       <caption xml:lang="ko">Dolphin은 사용하고 싶은 대로 설정할 수 있습니다</caption>
       <caption xml:lang="my">လင်းပိုင်သည် ဖိုင်လ်မန်နေဂျာကို သင်ကြိုက်သလို ပြင်ဆင်ခွင့်ပေးထားသည်</caption>
       <caption xml:lang="nl">Dolphin laat u uw bestandsbeheerder exact configureren zoals u dat wilt</caption>
+      <caption xml:lang="nn">Dolphin lèt deg tilpassa filhandsamaren akkurat slik du vil ha han</caption>
       <caption xml:lang="pl">Dolphin umożliwia ustawienie zarządzania plikami dokładnie tak, jak tego chcesz</caption>
       <caption xml:lang="pt">O Dolphin permite-lhe configurar o seu gestor de ficheiros exactamente como pretende</caption>
       <caption xml:lang="pt-BR">O Dolphin permite a você configurar seu gerenciador de arquivos exatamente como você quer</caption>
-- 
cgit v1.3


From 9d08bb5b97b02843e778d84bfc1ff793cded03bf Mon Sep 17 00:00:00 2001
From: Heiko Becker <heiko.becker@kde.org>
Date: Fri, 28 Jan 2022 23:29:39 +0100
Subject: GIT_SILENT Update Appstream for new release

---
 src/org.kde.dolphin.appdata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index 2aac78253..81d1df861 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -414,9 +414,9 @@
     <binary>dolphin</binary>
   </provides>
   <releases>
+    <release version="21.12.2" date="2022-02-03"/>
     <release version="21.12.1" date="2022-01-06"/>
     <release version="21.12.0" date="2021-12-09"/>
     <release version="21.08.3" date="2021-11-04"/>
-    <release version="21.08.2" date="2021-10-07"/>
   </releases>
 </component>
-- 
cgit v1.3


From 43e915213e64f03d785c87cc5cf8db1c6b86a1a2 Mon Sep 17 00:00:00 2001
From: Eugene Popov <popov895@ukr.net>
Date: Sat, 29 Jan 2022 16:35:47 +0000
Subject: Revert "[DetailsView] Improve zooming"

This reverts commit 7908aff3b5ebe4484d391c1fc4797e9dae2300b2.

Reverting this commit will fix the issue of not being able to rename
the last file in Details View and will also make the items in Details
View and Compact View have the same height.

BUG: 447215
FIXED-IN: 21.12.2
---
 src/kitemviews/kstandarditemlistwidget.cpp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 175181271..9c527fa17 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -226,22 +226,8 @@ void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVect
 void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
 {
     const KItemListStyleOption& option = view->styleOption();
-
-    float zoomLevel = 1;
-    if (option.iconSize >= KIconLoader::SizeEnormous) {
-        zoomLevel = 2;
-    } else if (option.iconSize >= KIconLoader::SizeHuge) {
-        zoomLevel = 1.8;
-    } else if (option.iconSize >= KIconLoader::SizeLarge) {
-        zoomLevel = 1.6;
-    } else if (option.iconSize >= KIconLoader::SizeMedium) {
-        zoomLevel = 1.4;
-    } else if (option.iconSize >= KIconLoader::SizeSmallMedium) {
-        zoomLevel = 1.2;
-    }
-
-    const qreal contentHeight = qMax<qreal>(option.iconSize, zoomLevel * option.fontMetrics.height());
-    logicalHeightHints.fill(contentHeight + 2 * option.padding);
+    const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height());
+    logicalHeightHints.fill(height);
     logicalWidthHint = -1.0;
 }
 
-- 
cgit v1.3