From 64dd9962c4c9f61eaeabc6d1f751a8e3daad76bc Mon Sep 17 00:00:00 2001
From: Neil Burrows <neil.burrows@nvable.com>
Date: Thu, 18 Jun 2020 16:09:18 +0100
Subject: [PATCH] Rounded corners on Items in new ItemGrid

---
 components/ItemGrid2/GridItem.brs |  13 +++++++------
 components/ItemGrid2/GridItem.xml |   6 ++++--
 images/postermask.png             | Bin 0 -> 3129 bytes
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 images/postermask.png

diff --git a/components/ItemGrid2/GridItem.brs b/components/ItemGrid2/GridItem.brs
index f5bfbac3..f9ecd081 100644
--- a/components/ItemGrid2/GridItem.brs
+++ b/components/ItemGrid2/GridItem.brs
@@ -1,6 +1,9 @@
 sub init()
+  m.posterMask = m.top.findNode("posterMask")
   m.itemPoster = m.top.findNode("itemPoster")
   m.itemText = m.top.findNode("itemText")
+
+  m.itemText.translation = [0, m.itemPoster.height + 7]
 end sub
 
 sub itemContentChanged()
@@ -9,14 +12,12 @@ sub itemContentChanged()
 
   if itemData = invalid then return
 
-  itemPoster = m.top.findNode("itemPoster")
-
   if itemData.type = "Movie" then
-    itemPoster.uri = itemData.PosterUrl
+    m.itemPoster.uri = itemData.PosterUrl
     m.itemText.text = itemData.Title
     return
   else if itemData.type = "Series" then
-    itemPoster.uri = itemData.PosterUrl
+    m.itemPoster.uri = itemData.PosterUrl
     m.itemText.text = itemData.Title
     return
   end if
@@ -28,8 +29,8 @@ end sub
 '
 'Use FocusPercent to animate scaling of Poser Image
 sub focusChanging()
-  scaleFactor = 1 + (m.top.focusPercent * 0.17333)
-  m.itemPoster.scale = [scaleFactor, scaleFactor]
+  scaleFactor = 0.85 + (m.top.focusPercent * 0.15)
+  m.posterMask.scale = [scaleFactor, scaleFactor]
 end sub
 
 '
diff --git a/components/ItemGrid2/GridItem.xml b/components/ItemGrid2/GridItem.xml
index 8fcf9fd9..fb9d803e 100644
--- a/components/ItemGrid2/GridItem.xml
+++ b/components/ItemGrid2/GridItem.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <component name="GridItem" extends="Group">
   <children>
-    <Poster id="itemPoster" width="250" height="375" translation="[21,35]" loadDisplayMode="scaleToZoom" loadingBitmapUri="pkg:/images/PosterLoading.png" failedBitmapUri="pkg:/images/PosterFailed.png" scaleRotateCenter="[147.5, 220]" />
-    <ScrollingLabel id="itemText" horizAlign="center" font="font:SmallSystemFont" maxWidth="295" translation="[0,442]" repeatCount="-1" visible="false"  />
+    <maskGroup id="posterMask" maskUri="pkg:/images/postermask.png" scaleRotateCenter="[145, 212.5]" scale="[0.85,0.85]"  >
+      <Poster id="itemPoster" width="290" height="425" loadDisplayMode="scaleToZoom" loadingBitmapUri="pkg:/images/PosterLoading.png" failedBitmapUri="pkg:/images/PosterFailed.png" />
+    </maskGroup>
+    <ScrollingLabel id="itemText" horizAlign="center" font="font:SmallSystemFont" maxWidth="290" repeatCount="-1" visible="false"  />
   </children>
   <interface>
     <field id="itemContent" type="node" onChange="itemContentChanged" />
diff --git a/images/postermask.png b/images/postermask.png
new file mode 100644
index 0000000000000000000000000000000000000000..1984f9a77db565afb446bde8e0480178519499ad
GIT binary patch
literal 3129
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
Gr~C&^;FoX!

literal 0
HcmV?d00001