From fad0f2e6083c538fe4cafa6e4ca30cb68b7841da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= <jaakko.keranen@iki.fi>
Date: Sat, 2 Jul 2016 10:53:27 +0300
Subject: [PATCH] UI|Home: Tweaked package Info popup contents

---
 .../apps/client/src/ui/widgets/packagepopupwidget.cpp  | 10 +++++-----
 doomsday/apps/client/src/ui/widgets/packageswidget.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doomsday/apps/client/src/ui/widgets/packagepopupwidget.cpp b/doomsday/apps/client/src/ui/widgets/packagepopupwidget.cpp
index 19c1893715..d8d4dff00e 100644
--- a/doomsday/apps/client/src/ui/widgets/packagepopupwidget.cpp
+++ b/doomsday/apps/client/src/ui/widgets/packagepopupwidget.cpp
@@ -65,6 +65,11 @@ bool PackagePopupWidget::setup(File const *file)
             msg += "\n" _E(l) "Author(s): " _E(.)_E(>) + meta.gets("author") + _E(<);
         }
 
+        if (meta.has("notes"))
+        {
+            msg += "\n\n" + meta.gets("notes") + "\n";
+        }
+
         if (meta.has("requires"))
         {
             msg += "\n" _E(l) "Requires:" _E(.);
@@ -85,11 +90,6 @@ bool PackagePopupWidget::setup(File const *file)
             }
         }
 
-        if (meta.has("notes"))
-        {
-            msg += "\n\n" + meta.gets("notes");
-        }
-
         document().setText(msg);
         return true;
     }
diff --git a/doomsday/apps/client/src/ui/widgets/packageswidget.cpp b/doomsday/apps/client/src/ui/widgets/packageswidget.cpp
index 3be3343d17..89ec5425cc 100644
--- a/doomsday/apps/client/src/ui/widgets/packageswidget.cpp
+++ b/doomsday/apps/client/src/ui/widgets/packageswidget.cpp
@@ -377,7 +377,7 @@ DENG_GUI_PIMPL(PackagesWidget)
 
             if (!item.info) return false;
 
-            bool const hidden = Package::tags(item.info->gets(VAR_TAGS)).contains(TAG_HIDDEN);
+            bool const hidden = Package::matchTags(*item.file, QStringLiteral("\\bhidden\\b"));
             if (showHidden ^ hidden)
             {
                 return false;