Merge pull request #5619 from decentraland/hotfix/camera-reel-thumbnails

fix: thumbnails scroll masking & pointer events and increased spacing in the reel grid

Author: lorux0

unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Prefabs/MonthGridContainer.prefab

@@ -225,12 +225,12 @@ PrefabInstance:
     - target: {fileID: 4071603596337262758, guid: a0b08d9ca8421644db83c1bd3f2e2e48,
         type: 3}
       propertyPath: model.spaceBetweenItems.x
-      value: 2
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 4071603596337262758, guid: a0b08d9ca8421644db83c1bd3f2e2e48,
         type: 3}
       propertyPath: model.spaceBetweenItems.y
-      value: 2
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 4071603596337262758, guid: a0b08d9ca8421644db83c1bd3f2e2e48,
         type: 3}
@@ -701,12 +701,12 @@ PrefabInstance:
     - target: {fileID: 7829080691771640198, guid: a0b08d9ca8421644db83c1bd3f2e2e48,
         type: 3}
       propertyPath: m_Spacing.x
-      value: 2
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 7829080691771640198, guid: a0b08d9ca8421644db83c1bd3f2e2e48,
         type: 3}
       propertyPath: m_Spacing.y
-      value: 2
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 7829080691771640198, guid: a0b08d9ca8421644db83c1bd3f2e2e48,
         type: 3}

unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Prefabs/ScreenshotThumbnail.prefab

@@ -841,8 +841,6 @@ GameObject:
   - component: {fileID: 3405051900245707662}
   - component: {fileID: 8468188487045077624}
   - component: {fileID: 2566079238092881621}
-  - component: {fileID: 8156839644814245974}
-  - component: {fileID: 6465448134092813593}
   - component: {fileID: 6784646814467949724}
   m_Layer: 5
   m_Name: ScreenshotThumbnail
@@ -974,7 +972,6 @@ MonoBehaviour:
   interactionButton: {fileID: 7601412762815726015}
   contextMenuButton: {fileID: 9008938835542233143}
   contextMenu: {fileID: 1780717873238825389}
-  canvas: {fileID: 8156839644814245974}
 --- !u!114 &3405051900245707662
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1018,44 +1015,6 @@ MonoBehaviour:
   playClick: 1
   playRelease: 1
   extraClickEvent: {fileID: 0}
---- !u!223 &8156839644814245974
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3698480427522893417}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 4
-  m_TargetDisplay: 0
---- !u!114 &6465448134092813593
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3698480427522893417}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
 --- !u!114 &6784646814467949724
 MonoBehaviour:
   m_ObjectHideFlags: 0

unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/CameraReelGalleryView.cs

@@ -1,5 +1,4 @@
 using Cysharp.Threading.Tasks;
-using DCL.Components.UI;
 using DCL.Helpers;
 using DCL.Tasks;
 using DCLServices.CameraReelService;
@@ -97,13 +96,6 @@ public void AddScreenshotThumbnail(CameraReelResponse reel, bool setAsFirst)
             thumbnail.Show(reel);
             thumbnail.OnClicked += () => ScreenshotThumbnailClicked?.Invoke(reel);
 
-            // The thumbnail has an internal Canvas to be able to override the Z sorting when playing animations
-            // but this messes up the UI masking
-            // As a workaround, a manual masking is applied to the thumbnail given by the current's mask rectangle
-            MaskCanvasRenderer masking = thumbnail.GetComponent<MaskCanvasRenderer>();
-            if (masking)
-                masking.MaskRectTransform = scrollMaskTransform;
-
             if (setAsFirst)
                 thumbnail.transform.SetAsFirstSibling();
 

unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/CameraReelThumbnail.cs

@@ -14,18 +14,15 @@ public class CameraReelThumbnail : MonoBehaviour, IPointerEnterHandler, IPointer
         [SerializeField] private Button interactionButton;
         [SerializeField] private Button contextMenuButton;
         [SerializeField] private ThumbnailContextMenuView contextMenu;
-        [SerializeField] private Canvas canvas;
 
         private CameraReelResponse picture;
-        private int canvasOriginalSortingOrder;
 
         public event Action OnClicked;
 
         private void Awake()
         {
             interactionButton.onClick.AddListener(() => OnClicked?.Invoke());
             contextMenuButton.onClick.AddListener(() => contextMenu.Show(picture));
-            canvasOriginalSortingOrder = canvas.sortingOrder;
 
             image.OnLoaded += _ =>
             {
@@ -47,14 +44,12 @@ public int CompareTo(CameraReelThumbnail thumbnail) =>
 
         public void OnPointerEnter(PointerEventData eventData)
         {
-            transform.DOScale(Vector3.one * 1.05f, 0.3f);
-            canvas.sortingOrder++;
+            transform.DOScale(Vector3.one * 1.03f, 0.3f);
         }
 
         public void OnPointerExit(PointerEventData eventData)
         {
             transform.DOScale(Vector3.one, 0.3f);
-            canvas.sortingOrder = canvasOriginalSortingOrder;
         }
     }
 }