Merge branch 'upstream/development' into genewalt/gitflow_210628

Signed-off-by: Gene Walters <genewalt@amazon.com>

Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonRunnerRequestsBus.h

@@ -24,16 +24,22 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
 
         //! executes a Python script using a string, prints the result if printResult is true and script is an expression
-        virtual void ExecuteByString(AZStd::string_view script, bool printResult) { AZ_UNUSED(script); AZ_UNUSED(printResult); }
+        virtual void ExecuteByString([[maybe_unused]] AZStd::string_view script, [[maybe_unused]] bool printResult) {}
 
         //! executes a Python script using a filename
-        virtual void ExecuteByFilename(AZStd::string_view filename) { AZ_UNUSED(filename); }
+        virtual void ExecuteByFilename([[maybe_unused]] AZStd::string_view filename) {}
 
         //! executes a Python script using a filename and args
-        virtual void ExecuteByFilenameWithArgs(AZStd::string_view filename, const AZStd::vector<AZStd::string_view>& args) { AZ_UNUSED(filename); AZ_UNUSED(args);  }
+        virtual void ExecuteByFilenameWithArgs(
+            [[maybe_unused]] AZStd::string_view filename, [[maybe_unused]] const AZStd::vector<AZStd::string_view>& args) {}
 
         //! executes a Python script as a test
-        virtual void ExecuteByFilenameAsTest(AZStd::string_view filename, const AZStd::vector<AZStd::string_view>& args) { AZ_UNUSED(filename); AZ_UNUSED(args); }
+        virtual void ExecuteByFilenameAsTest(
+            [[maybe_unused]] AZStd::string_view filename,
+            [[maybe_unused]] AZStd::string_view testCase,
+            [[maybe_unused]] const AZStd::vector<AZStd::string_view>& args)
+        {
+        }
     };
     using EditorPythonRunnerRequestBus = AZ::EBus<EditorPythonRunnerRequests>;
 

Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonScriptNotificationsBus.h

@@ -0,0 +1,45 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+#pragma once
+
+#include <AzCore/EBus/EBus.h>
+#include <AzCore/std/string/string.h>
+
+namespace AzToolsFramework
+{
+    //! Provides a bus to notify when Python scripts are about to run.
+    class EditorPythonScriptNotifications
+        : public AZ::EBusTraits
+    {
+    public:
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
+        //////////////////////////////////////////////////////////////////////////
+
+        //! Notifies the start of execution of a Python script using a string.
+        virtual void OnStartExecuteByString([[maybe_unused]] AZStd::string_view script) {}
+
+        //! Notifies the start of execution of a Python script using a filename.
+        virtual void OnStartExecuteByFilename([[maybe_unused]] AZStd::string_view filename) {}
+
+        //! Notifies the start of execution of a Python script using a filename and args.
+        virtual void OnStartExecuteByFilenameWithArgs(
+            [[maybe_unused]] AZStd::string_view filename, [[maybe_unused]] const AZStd::vector<AZStd::string_view>& args) {}
+
+        //! Notifies the start of execution of a Python script as a test.
+        virtual void OnStartExecuteByFilenameAsTest(
+            [[maybe_unused]] AZStd::string_view filename, [[maybe_unused]] AZStd::string_view testCase, [[maybe_unused]] const AZStd::vector<AZStd::string_view>& args) {}
+    };
+    using EditorPythonScriptNotificationsBus = AZ::EBus<EditorPythonScriptNotifications>;
+}

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.cpp

@@ -180,10 +180,11 @@ namespace AzToolsFramework
 
         void AssetBrowserTreeView::rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end)
         {
-            // if selected entry is being removed, clear selection so not to select (and attempt to preview) other entries potentially marked for deletion
-            if (selectionModel() && selectionModel()->selectedIndexes().size() == 1)
+            // if selected entry is being removed, clear selection so not to select (and attempt to preview) other entries potentially
+            // marked for deletion
+            if (selectionModel() && selectedIndexes().size() == 1)
             {
-                QModelIndex selectedIndex = selectionModel()->selectedIndexes().first();
+                QModelIndex selectedIndex = selectedIndexes().first();
                 QModelIndex parentSelectedIndex = selectedIndex.parent();
                 if (parentSelectedIndex == parent && selectedIndex.row() >= start && selectedIndex.row() <= end)
                 {
@@ -193,6 +194,14 @@ namespace AzToolsFramework
             QTreeView::rowsAboutToBeRemoved(parent, start, end);
         }
 
+        // Item data for hidden columns normally isn't copied by Qt during drag-and-drop (see QTBUG-30242).
+        // However, for the AssetBrowser, the hidden columns should get copied. By overriding selectedIndexes() to
+        // include all selected indices, not just the visible ones, we can get the behavior we're looking for.
+        QModelIndexList AssetBrowserTreeView::selectedIndexes() const
+        {
+            return selectionModel()->selectedIndexes();
+        }
+
         void AssetBrowserTreeView::SetThumbnailContext(const char* thumbnailContext) const
         {
             m_delegate->SetThumbnailContext(thumbnailContext);

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h

@@ -90,6 +90,9 @@ namespace AzToolsFramework
             void selectionChanged(const QItemSelection& selected, const QItemSelection& deselected) override;
             void rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end) override;
 
+        protected:
+            QModelIndexList selectedIndexes() const override;
+
         private:
             QPointer<AssetBrowserModel> m_assetBrowserModel = nullptr;
             QPointer<AssetBrowserFilterModel> m_assetBrowserSortFilterProxyModel = nullptr;

Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake

@@ -37,6 +37,7 @@ set(FILES
     API/EditorVegetationRequestsBus.h
     API/EditorPythonConsoleBus.h
     API/EditorPythonRunnerRequestsBus.h
+    API/EditorPythonScriptNotificationsBus.h
     API/EntityPropertyEditorRequestsBus.h
     API/EditorWindowRequestBus.h
     API/EntityCompositionRequestBus.h