From d7ca3f273bb656f0b162eeeede07ba87cafca22f Mon Sep 17 00:00:00 2001
From: igarri <igarri@amazon.com>
Date: Thu, 13 May 2021 13:25:03 +0100
Subject: [PATCH] croll to top on view when the filter updates

---
 .../AssetBrowser/AssetBrowserTableModel.cpp              | 1 +
 .../AssetBrowser/Views/AssetBrowserTableView.cpp         | 9 +++++++++
 .../AssetBrowser/Views/AssetBrowserTableView.h           | 1 +
 3 files changed, 11 insertions(+)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp
index 13b298cdec..7991eb35d8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp
@@ -145,6 +145,7 @@ namespace AzToolsFramework
             }
             BuildTableModelMap(sourceModel());
             emit layoutChanged();
+            
         }
     } // namespace AssetBrowser
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.cpp
index 40e0b9db5e..83a0f2ce9f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.cpp
@@ -58,6 +58,8 @@ namespace AzToolsFramework
             AZ_Assert(m_tableModel, "Expecting AssetBrowserTableModel");
             m_sourceFilterModel = qobject_cast<AssetBrowserFilterModel*>(m_tableModel->sourceModel());
             QTableView::setModel(model);
+            connect(m_tableModel, &AssetBrowserTableModel::layoutChanged, this, &AssetBrowserTableView::layoutChangedSlot);
+
             horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeMode::Stretch);
             horizontalHeader()->setSectionResizeMode(1,QHeaderView::ResizeMode::Stretch);
         }
@@ -103,6 +105,13 @@ namespace AzToolsFramework
             }
             QTableView::rowsAboutToBeRemoved(parent, start, end);
         }
+        void AssetBrowserTableView::layoutChangedSlot(const QList<QPersistentModelIndex>& parents, QAbstractItemModel::LayoutChangeHint hint)
+        {
+            AZ_UNUSED(parents);
+            AZ_UNUSED(hint);
+
+            scrollToTop();
+        }
         void AssetBrowserTableView::SelectProduct(AZ::Data::AssetId assetID)
         {
             AZ_UNUSED(assetID);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.h
index 531e962297..b39d48c391 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.h
@@ -57,6 +57,7 @@ namespace AzToolsFramework
         protected Q_SLOTS:
             void selectionChanged(const QItemSelection& selected, const QItemSelection& deselected) override;
             void rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
+            void layoutChangedSlot(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint);
 
         private:
             QString m_name;