Merge pull request #6991 from aws-lumberyard-dev/michabr/lyshine_crycommon

Move remaining two LyShine headers to the gem

Code/Legacy/CryCommon/crycommon_files.cmake

@@ -100,8 +100,6 @@ set(FILES
     platform_impl.cpp
     Win32specific.h
     Win64specific.h
-    LyShine/UiAssetTypes.h
-    LyShine/Bus/UiCursorBus.h
     Maestro/Bus/EditorSequenceAgentComponentBus.h
     Maestro/Bus/EditorSequenceBus.h
     Maestro/Bus/EditorSequenceComponentBus.h

Code/Legacy/CrySystem/System.cpp

@@ -134,7 +134,6 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 #include <PNoise3.h>
 
-#include <LyShine/Bus/UiCursorBus.h>
 #include <AzFramework/Asset/AssetSystemBus.h>
 #include <AzFramework/Input/Buses/Requests/InputSystemRequestBus.h>
 
@@ -1374,7 +1373,6 @@ bool CSystem::HandleMessage([[maybe_unused]] HWND hWnd, UINT uMsg, WPARAM wParam
     // Fall through intended
     case WM_ENTERMENULOOP:
     {
-        UiCursorBus::Broadcast(&UiCursorInterface::IncrementVisibleCounter);
         return true;
     }
     case WM_CAPTURECHANGED:
@@ -1392,7 +1390,6 @@ bool CSystem::HandleMessage([[maybe_unused]] HWND hWnd, UINT uMsg, WPARAM wParam
     // Fall through intended
     case WM_EXITMENULOOP:
     {
-        UiCursorBus::Broadcast(&UiCursorInterface::DecrementVisibleCounter);
         return (uMsg != WM_CAPTURECHANGED);
     }
     case WM_SYSKEYUP:

Code/Legacy/CrySystem/XConsole.cpp

@@ -29,7 +29,6 @@
 #include <AzCore/std/algorithm.h>
 #include <AzCore/Time/ITime.h>
 
-#include <LyShine/Bus/UiCursorBus.h>
 //#define DEFENCE_CVAR_HASH_LOGGING
 
 // s should point to a buffer at least 65 chars long
@@ -749,8 +748,6 @@ void    CXConsole::ShowConsole(bool show, const int iRequestScrollMax)
 
     if (show && !m_bConsoleActive)
     {
-        UiCursorBus::Broadcast(&UiCursorBus::Events::IncrementVisibleCounter);
-
         AzFramework::InputSystemCursorRequestBus::EventResult(m_previousSystemCursorState,
             AzFramework::InputDeviceMouse::Id,
             &AzFramework::InputSystemCursorRequests::GetSystemCursorState);
@@ -760,8 +757,6 @@ void    CXConsole::ShowConsole(bool show, const int iRequestScrollMax)
     }
     else if (!show && m_bConsoleActive)
     {
-        UiCursorBus::Broadcast(&UiCursorBus::Events::DecrementVisibleCounter);
-
         AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
             &AzFramework::InputSystemCursorRequests::SetSystemCursorState,
             m_previousSystemCursorState);

Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.cpp

@@ -9,7 +9,6 @@
 #include "FontBuilderWorker.h"
 
 #include <AzFramework/StringFunc/StringFunc.h>
-#include <LyShine/UiAssetTypes.h>
 
 #include <QString>
 #include <QFileInfo>
@@ -52,7 +51,8 @@ namespace CopyDependencyBuilder
         
         if (fileExtension == "font" || fileExtension == "fontfamily")
         {
-            return azrtti_typeid<LyShine::FontAsset>();
+            static AZ::Data::AssetType fontAssetType("{57767D37-0EBE-43BE-8F60-AB36D2056EF8}"); // form UiAssetTypes.h in the LyShine gem
+            return fontAssetType;
         }
 
         return AZ::Data::AssetType::CreateNull();

Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp

@@ -19,8 +19,6 @@
 #include <AzCore/UnitTest/UnitTest.h>
 #include <AzCore/Utils/Utils.h>
 
-#include <LyShine/UiAssetTypes.h>
-
 #include <Builders/CopyDependencyBuilder/CfgBuilderWorker/CfgBuilderWorker.h>
 #include <Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.h>
 #include <Builders/CopyDependencyBuilder/SchemaBuilderWorker/SchemaBuilderWorker.h>

Gems/LyShine/Code/lyshine_static_files.cmake

@@ -11,6 +11,7 @@ set(FILES
     Include/LyShine/IRenderGraph.h
     Include/LyShine/ISprite.h
     Include/LyShine/ILyShine.h
+    Include/LyShine/UiAssetTypes.h
     Include/LyShine/UiBase.h
     Include/LyShine/UiLayoutCellBase.h
     Include/LyShine/UiSerializeHelpers.h
@@ -26,6 +27,7 @@ set(FILES
     Include/LyShine/Bus/UiCanvasManagerBus.h
     Include/LyShine/Bus/UiCanvasUpdateNotificationBus.h
     Include/LyShine/Bus/UiCheckboxBus.h
+    Include/LyShine/Bus/UiCursorBus.h
     Include/LyShine/Bus/UiDraggableBus.h
     Include/LyShine/Bus/UiDropdownBus.h
     Include/LyShine/Bus/UiDropdownOptionBus.h