GemCatalog: Gem cart widget and overlay window

* [LYN-4174] Added icons for gem catalog summary cart

* [LYN-4174] Gem Catalog: Text eliding for too long gem names and creators

* [LYN-4174] Gem catalog: Resetting filters when re-initializing for another project

* [LYN-4174] Gem Catalog: Fixed a bug with filters being applied/remembered after leaving gem catalog and coming back editing another project

* [LYN-4174] GemCatalog: Gem cart widget and overlay window

* Added cart button with dynamic label to display the number of gems to be enabled/disabled and a arrow down button to indicate some sort of pop-up/overlay window will appear on click.
* Overlay gem tags update dynamically while the dialog is open based on the gem model.
* Moved some styling from C++ to the style sheet.

Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp

@@ -10,24 +10,229 @@
 *
 */
 
-#include <AzQtComponents/Components/SearchLineEdit.h>
 #include <GemCatalog/GemCatalogHeaderWidget.h>
 #include <QHBoxLayout>
+#include <QMouseEvent>
 #include <QLabel>
+#include <QPushButton>
+#include <TagWidget.h>
 
 namespace O3DE::ProjectManager
 {
-    GemCatalogHeaderWidget::GemCatalogHeaderWidget(GemSortFilterProxyModel* filterProxyModel, QWidget* parent)
+    CartOverlayWidget::CartOverlayWidget(GemModel* gemModel, QWidget* parent)
+        : QWidget(parent)
+        , m_gemModel(gemModel)
+    {
+        setObjectName("GemCatalogCart");
+
+        m_layout = new QVBoxLayout();
+        m_layout->setSpacing(0);
+        m_layout->setMargin(0);
+        m_layout->setAlignment(Qt::AlignTop);
+        setLayout(m_layout);
+
+        QHBoxLayout* hLayout = new QHBoxLayout();
+
+        QPushButton* closeButton = new QPushButton();
+        closeButton->setFlat(true);
+        closeButton->setFocusPolicy(Qt::NoFocus);
+        closeButton->setIcon(QIcon(":/WindowClose.svg"));
+        connect(closeButton, &QPushButton::clicked, this, [=]
+            {
+                deleteLater();
+            });
+        hLayout->addSpacerItem(new QSpacerItem(10, 0, QSizePolicy::Expanding));
+        hLayout->addWidget(closeButton);
+        m_layout->addLayout(hLayout);
+
+        // enabled
+        {
+            m_enabledWidget = new QWidget();
+            m_enabledWidget->setFixedWidth(s_width);
+            m_layout->addWidget(m_enabledWidget);
+
+            QVBoxLayout* layout = new QVBoxLayout();
+            layout->setAlignment(Qt::AlignTop);
+            m_enabledWidget->setLayout(layout);
+
+            m_enabledLabel = new QLabel();
+            m_enabledLabel->setObjectName("GemCatalogCartOverlaySectionLabel");
+            layout->addWidget(m_enabledLabel);
+            m_enabledTagContainer = new TagContainerWidget();
+            layout->addWidget(m_enabledTagContainer);
+        }
+
+        // disabled
+        {
+            m_disabledWidget = new QWidget();
+            m_disabledWidget->setFixedWidth(s_width);
+            m_layout->addWidget(m_disabledWidget);
+
+            QVBoxLayout* layout = new QVBoxLayout();
+            layout->setAlignment(Qt::AlignTop);
+            m_disabledWidget->setLayout(layout);
+
+            m_disabledLabel = new QLabel();
+            m_disabledLabel->setObjectName("GemCatalogCartOverlaySectionLabel");
+            layout->addWidget(m_disabledLabel);
+            m_disabledTagContainer = new TagContainerWidget();
+            layout->addWidget(m_disabledTagContainer);
+        }
+
+        setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog);
+
+        Update();
+        connect(gemModel, &GemModel::dataChanged, this, [=]
+            {
+                Update();
+            });
+    }
+
+    void CartOverlayWidget::Update()
+    {
+        const QVector<QModelIndex> toBeAdded = m_gemModel->GatherGemsToBeAdded();
+        if (toBeAdded.isEmpty())
+        {
+            m_enabledWidget->hide();
+        }
+        else
+        {
+            m_enabledTagContainer->Update(ConvertFromModelIndices(toBeAdded));
+            m_enabledLabel->setText(QString("%1 %2").arg(QString::number(toBeAdded.size()), tr("Gems to be enabled")));
+            m_enabledWidget->show();
+        }
+
+        const QVector<QModelIndex> toBeRemoved = m_gemModel->GatherGemsToBeRemoved();
+        if (toBeRemoved.isEmpty())
+        {
+            m_disabledWidget->hide();
+        }
+        else
+        {
+            m_disabledTagContainer->Update(ConvertFromModelIndices(toBeRemoved));
+            m_disabledLabel->setText(QString("%1 %2").arg(QString::number(toBeRemoved.size()), tr("Gems to be disabled")));
+            m_disabledWidget->show();
+        }
+    }
+
+    QStringList CartOverlayWidget::ConvertFromModelIndices(const QVector<QModelIndex>& gems) const
+    {
+        QStringList gemNames;
+        gemNames.reserve(gems.size());
+        for (const QModelIndex& modelIndex : gems)
+        {
+            gemNames.push_back(GemModel::GetName(modelIndex));
+        }
+        return gemNames;
+    }
+
+    CartButton::CartButton(GemModel* gemModel, QWidget* parent)
+        : QWidget(parent)
+        , m_gemModel(gemModel)
+    {
+        m_layout = new QHBoxLayout();
+        m_layout->setMargin(0);
+        setLayout(m_layout);
+
+        QPushButton* iconButton = new QPushButton();
+        iconButton->setFlat(true);
+        iconButton->setFocusPolicy(Qt::NoFocus);
+        iconButton->setIcon(QIcon(":/Summary.svg"));
+        iconButton->setFixedSize(s_iconSize, s_iconSize);
+        connect(iconButton, &QPushButton::clicked, this, &CartButton::ShowOverlay);
+        m_layout->addWidget(iconButton);
+
+        m_countLabel = new QLabel();
+        m_countLabel->setObjectName("GemCatalogCartCountLabel");
+        m_countLabel->setFixedHeight(s_iconSize - 1); // Compensate for the empty icon space by using a slightly smaller label height.
+        m_layout->addWidget(m_countLabel);
+
+        m_dropDownButton = new QPushButton();
+        m_dropDownButton->setFlat(true);
+        m_dropDownButton->setFocusPolicy(Qt::NoFocus);
+        m_dropDownButton->setIcon(QIcon(":/CarrotArrowDown.svg"));
+        m_dropDownButton->setFixedSize(s_arrowDownIconSize, s_arrowDownIconSize);
+        connect(m_dropDownButton, &QPushButton::clicked, this, &CartButton::ShowOverlay);
+        m_layout->addWidget(m_dropDownButton);
+
+        // Adjust the label text whenever the model gets updated.
+        connect(gemModel, &GemModel::dataChanged, [=]
+            {
+                const QVector<QModelIndex> toBeAdded = m_gemModel->GatherGemsToBeAdded();
+                const QVector<QModelIndex> toBeRemoved = m_gemModel->GatherGemsToBeRemoved();
+
+                const int count = toBeAdded.size() + toBeRemoved.size();
+                m_countLabel->setText(QString::number(count));
+
+                m_dropDownButton->setVisible(!toBeAdded.isEmpty() || !toBeRemoved.isEmpty());
+
+                // Automatically close the overlay window in case there are no gems to be enabled or disabled anymore.
+                if (m_cartOverlay && toBeAdded.isEmpty() && toBeRemoved.isEmpty())
+                {
+                    m_cartOverlay->deleteLater();
+                    m_cartOverlay = nullptr;
+                }
+            });
+    }
+
+    void CartButton::mousePressEvent([[maybe_unused]] QMouseEvent* event)
+    {
+        ShowOverlay();
+    }
+
+    void CartButton::ShowOverlay()
+    {
+        const QVector<QModelIndex> toBeAdded = m_gemModel->GatherGemsToBeAdded();
+        const QVector<QModelIndex> toBeRemoved = m_gemModel->GatherGemsToBeRemoved();
+        if (toBeAdded.isEmpty() && toBeRemoved.isEmpty())
+        {
+            return;
+        }
+
+        if (m_cartOverlay)
+        {
+            // Directly delete the former overlay before creating the new one.
+            // Don't use deleteLater() here. This might overwrite the new overlay pointer
+            // depending on the event queue.
+            delete m_cartOverlay;
+        }
+
+        m_cartOverlay = new CartOverlayWidget(m_gemModel, this);
+        connect(m_cartOverlay, &QWidget::destroyed, this, [=]
+            {
+                // Reset the overlay pointer on destruction to prevent dangling pointers.
+                m_cartOverlay = nullptr;
+            });
+        m_cartOverlay->show();
+
+        const QPoint parentPos = m_dropDownButton->mapToParent(m_dropDownButton->pos());
+        const QPoint globalPos = m_dropDownButton->mapToGlobal(m_dropDownButton->pos());
+        const QPoint offset(-4, 10);
+        m_cartOverlay->setGeometry(globalPos.x() - parentPos.x() - m_cartOverlay->width() + width() + offset.x(),
+            globalPos.y() + offset.y(),
+            m_cartOverlay->width(),
+            m_cartOverlay->height());
+    }
+
+    CartButton::~CartButton()
+    {
+        // Make sure the overlay window is automatically closed in case the gem catalog is destroyed.
+        if (m_cartOverlay)
+        {
+            m_cartOverlay->deleteLater();
+        }
+    }
+
+    GemCatalogHeaderWidget::GemCatalogHeaderWidget(GemModel* gemModel, GemSortFilterProxyModel* filterProxyModel, QWidget* parent)
         : QFrame(parent)
     {
         QHBoxLayout* hLayout = new QHBoxLayout();
         hLayout->setAlignment(Qt::AlignLeft);
-        hLayout->setMargin(0);
+        hLayout->setContentsMargins(10, 7, 10, 7);
         setLayout(hLayout);
 
         setObjectName("GemCatalogHeaderWidget");
-
-        hLayout->addSpacing(7);
+        setFixedHeight(s_height);
 
         QLabel* titleLabel = new QLabel(tr("Gem Catalog"));
         titleLabel->setObjectName("GemCatalogTitle");
@@ -35,17 +240,23 @@ namespace O3DE::ProjectManager
 
         hLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
 
-        AzQtComponents::SearchLineEdit* filterLineEdit = new AzQtComponents::SearchLineEdit();
-        filterLineEdit->setStyleSheet("background-color: #DDDDDD;");
-        connect(filterLineEdit, &QLineEdit::textChanged, this, [=](const QString& text)
+        m_filterLineEdit = new AzQtComponents::SearchLineEdit();
+        m_filterLineEdit->setStyleSheet("background-color: #DDDDDD;");
+        connect(m_filterLineEdit, &QLineEdit::textChanged, this, [=](const QString& text)
             {
                 filterProxyModel->SetSearchString(text);
             });
-        hLayout->addWidget(filterLineEdit);
+        hLayout->addWidget(m_filterLineEdit);
 
         hLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
-        hLayout->addSpacerItem(new QSpacerItem(140, 0, QSizePolicy::Fixed));
-        
-        setFixedHeight(60);
+        hLayout->addSpacerItem(new QSpacerItem(75, 0, QSizePolicy::Fixed));
+
+        CartButton* cartButton = new CartButton(gemModel);
+        hLayout->addWidget(cartButton);
+    }
+
+    void GemCatalogHeaderWidget::ReinitForProject()
+    {
+        m_filterLineEdit->setText({});
     }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h

@@ -13,19 +13,81 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <AzQtComponents/Components/SearchLineEdit.h>
+#include <GemCatalog/GemModel.h>
 #include <GemCatalog/GemSortFilterProxyModel.h>
+#include <TagWidget.h>
 #include <QFrame>
+#include <QLabel>
+#include <QDialog>
+#include <QMoveEvent>
+#include <QVBoxLayout>
 #endif
 
 namespace O3DE::ProjectManager
 {
+    class CartOverlayWidget
+        : public QWidget
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        CartOverlayWidget(GemModel* gemModel, QWidget* parent = nullptr);
+        void Update();
+
+    private:
+        QStringList ConvertFromModelIndices(const QVector<QModelIndex>& gems) const;
+
+        QVBoxLayout* m_layout = nullptr;
+        GemModel* m_gemModel = nullptr;
+
+        QWidget* m_enabledWidget = nullptr;
+        QLabel* m_enabledLabel = nullptr;
+        TagContainerWidget* m_enabledTagContainer = nullptr;
+
+        QWidget* m_disabledWidget = nullptr;
+        QLabel* m_disabledLabel = nullptr;
+        TagContainerWidget* m_disabledTagContainer = nullptr;
+
+        inline constexpr static int s_width = 240;
+    };
+
+    class CartButton
+        : public QWidget
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        CartButton(GemModel* gemModel, QWidget* parent = nullptr);
+        ~CartButton();
+        void ShowOverlay();
+
+    private:
+        void mousePressEvent(QMouseEvent* event) override;
+
+        GemModel* m_gemModel = nullptr;
+        QHBoxLayout* m_layout = nullptr;
+        QLabel* m_countLabel = nullptr;
+        QPushButton* m_dropDownButton = nullptr;
+        CartOverlayWidget* m_cartOverlay = nullptr;
+
+        inline constexpr static int s_iconSize = 24;
+        inline constexpr static int s_arrowDownIconSize = 8;
+    };
+
     class GemCatalogHeaderWidget
         : public QFrame
     {
         Q_OBJECT // AUTOMOC
 
     public:
-        explicit GemCatalogHeaderWidget(GemSortFilterProxyModel* filterProxyModel, QWidget* parent = nullptr);
+        explicit GemCatalogHeaderWidget(GemModel* gemModel, GemSortFilterProxyModel* filterProxyModel, QWidget* parent = nullptr);
         ~GemCatalogHeaderWidget() = default;
+
+        void ReinitForProject();
+
+    private:
+        AzQtComponents::SearchLineEdit* m_filterLineEdit = nullptr;
+        inline constexpr static int s_height = 60;
     };
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp

@@ -12,7 +12,6 @@
 
 #include <GemCatalog/GemCatalogScreen.h>
 #include <PythonBindingsInterface.h>
-#include <GemCatalog/GemCatalogHeaderWidget.h>
 #include <GemCatalog/GemListHeaderWidget.h>
 #include <GemCatalog/GemSortFilterProxyModel.h>
 #include <QVBoxLayout>
@@ -35,8 +34,8 @@ namespace O3DE::ProjectManager
         vLayout->setSpacing(0);
         setLayout(vLayout);
 
-        GemCatalogHeaderWidget* headerWidget = new GemCatalogHeaderWidget(m_proxModel);
-        vLayout->addWidget(headerWidget);
+        m_headerWidget = new GemCatalogHeaderWidget(m_gemModel, m_proxModel);
+        vLayout->addWidget(m_headerWidget);
 
         QHBoxLayout* hLayout = new QHBoxLayout();
         hLayout->setMargin(0);
@@ -77,10 +76,11 @@ namespace O3DE::ProjectManager
             m_filterWidget->deleteLater();
         }
 
+        m_proxModel->ResetFilters();
         m_filterWidget = new GemFilterWidget(m_proxModel);
         m_filterWidgetLayout->addWidget(m_filterWidget);
 
-        m_proxModel->InvalidateFilter();
+        m_headerWidget->ReinitForProject();
 
         // Select the first entry after everything got correctly sized
         QTimer::singleShot(200, [=]{

Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h

@@ -14,6 +14,7 @@
 
 #if !defined(Q_MOC_RUN)
 #include <ScreenWidget.h>
+#include <GemCatalog/GemCatalogHeaderWidget.h>
 #include <GemCatalog/GemFilterWidget.h>
 #include <GemCatalog/GemListView.h>
 #include <GemCatalog/GemInspector.h>
@@ -40,6 +41,7 @@ namespace O3DE::ProjectManager
         GemListView* m_gemListView = nullptr;
         GemInspector* m_gemInspector = nullptr;
         GemModel* m_gemModel = nullptr;
+        GemCatalogHeaderWidget* m_headerWidget = nullptr;
         GemSortFilterProxyModel* m_proxModel = nullptr;
         QVBoxLayout* m_filterWidgetLayout = nullptr;
         GemFilterWidget* m_filterWidget = nullptr;

Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp

@@ -53,6 +53,7 @@ namespace O3DE::ProjectManager
 
         QFont standardFont(options.font);
         standardFont.setPixelSize(s_fontSize);
+        QFontMetrics standardFontMetrics(standardFont);
 
         painter->save();
         painter->setClipping(true);
@@ -78,8 +79,10 @@ namespace O3DE::ProjectManager
         }
 
         // Gem name
-        const QString gemName = GemModel::GetName(modelIndex);
+        QString gemName = GemModel::GetName(modelIndex);
         QFont gemNameFont(options.font);
+        const int firstColumnMaxTextWidth = s_summaryStartX - 30;
+        gemName = QFontMetrics(gemNameFont).elidedText(gemName, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);
         gemNameFont.setPixelSize(s_gemNameFontSize);
         gemNameFont.setBold(true);
         QRect gemNameRect = GetTextRect(gemNameFont, gemName, s_gemNameFontSize);
@@ -90,7 +93,8 @@ namespace O3DE::ProjectManager
         painter->drawText(gemNameRect, Qt::TextSingleLine, gemName);
 
         // Gem creator
-        const QString gemCreator = GemModel::GetCreator(modelIndex);
+        QString gemCreator = GemModel::GetCreator(modelIndex);
+        gemCreator = standardFontMetrics.elidedText(gemCreator, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);
         QRect gemCreatorRect = GetTextRect(standardFont, gemCreator, s_fontSize);
         gemCreatorRect.moveTo(contentRect.left(), contentRect.top() + gemNameRect.height());
 

Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.cpp

@@ -130,4 +130,15 @@ namespace O3DE::ProjectManager
         invalidate();
         emit OnInvalidated();
     }
+
+    void GemSortFilterProxyModel::ResetFilters()
+    {
+        m_searchString.clear();
+        m_gemOriginFilter = {};
+        m_platformFilter = {};
+        m_typeFilter = {};
+        m_featureFilter = {};
+
+        InvalidateFilter();
+    }
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/GemCatalog/GemSortFilterProxyModel.h

@@ -51,6 +51,7 @@ namespace O3DE::ProjectManager
         void SetFeatures(const QSet<QString>& features) { m_featureFilter = features; InvalidateFilter(); }
 
         void InvalidateFilter();
+        void ResetFilters();
 
     signals:
         void OnInvalidated();