dont muck up music presentation views

jkim2492 · Jan 28, 2023 · 9d1b4d3 · 9d1b4d3
1 parent 2fa3a98
commit 9d1b4d3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/components/ItemGrid/MusicArtistGridItem.brs b/components/ItemGrid/MusicArtistGridItem.brs
@@ -16,14 +16,24 @@ sub init()
     end if
 
     m.gridTitles = get_user_setting("itemgrid.gridTitles")
-    m.posterText.visible = m.gridTitles = "showalways"
-    m.postTextBackground.visible = m.posterText.visible
+    m.posterText.visible = false
+    m.postTextBackground.visible = false
 
 end sub
 
 sub itemContentChanged()
     m.backdrop.blendColor = "#101010"
 
+    m.posterText.visible = false
+    m.postTextBackground.visible = false
+
+    if isValid(m.topParent.showItemTitles)
+        if LCase(m.topParent.showItemTitles) = "showalways"
+            m.posterText.visible = true
+            m.postTextBackground.visible = true
+        end if
+    end if
+
     itemData = m.top.itemContent
 
     if not isValid(itemData) then return
@@ -47,9 +57,11 @@ end sub
 
 'Display or hide title Visibility on focus change
 sub focusChanged()
-    if m.gridTitles = "showonhover"
-        m.posterText.visible = m.top.itemHasFocus
-        m.postTextBackground.visible = m.posterText.visible
+    if isValid(m.topParent.showItemTitles)
+        if LCase(m.topParent.showItemTitles) = "showonhover"
+            m.posterText.visible = m.top.itemHasFocus
+            m.postTextBackground.visible = m.posterText.visible
+        end if
     end if
 end sub
 

diff --git a/components/ItemGrid/MusicLibraryView.brs b/components/ItemGrid/MusicLibraryView.brs
@@ -135,6 +135,8 @@ sub loadInitialItems()
         m.sortAscending = false
     end if
 
+    m.top.showItemTitles = get_user_setting("itemgrid.gridTitles")
+
     if LCase(m.top.parentItem.json.type) = "musicgenre"
         m.itemGrid.translation = "[96, 60]"
         m.loadItemsTask.itemType = "MusicAlbum"
@@ -143,6 +145,7 @@ sub loadInitialItems()
         m.loadItemsTask.itemId = m.top.parentItem.parentFolder
     else if LCase(m.view) = "artistspresentation" or LCase(m.options.view) = "artistspresentation"
         m.loadItemsTask.genreIds = ""
+        m.top.showItemTitles = "hidealways"
     else if LCase(m.view) = "artistsgrid" or LCase(m.options.view) = "artistsgrid"
         m.loadItemsTask.genreIds = ""
     else

diff --git a/components/ItemGrid/MusicLibraryView.xml b/components/ItemGrid/MusicLibraryView.xml
@@ -33,13 +33,13 @@
   </children>
   <interface>
     <field id="HomeLibraryItem" type="string"/>
-    <field id="View" type="string"/>
     <field id="parentItem" type="node" onChange="loadInitialItems" />
     <field id="selectedItem" type="node" alwaysNotify="true" />
     <field id="quickPlayNode" type="node" alwaysNotify="true" />
     <field id="imageDisplayMode" type="string" value="scaleToZoom" />
     <field id="AlphaSelected" type="string" alias="AlphaMenu.itemAlphaSelected" alwaysNotify="true" onChange="onItemAlphaSelected" />
     <field id="alphaActive" type="boolean" value="false" />
+    <field id="showItemTitles" type="string" value="showonhover" />
     <field id="jumpToItem" type="integer" value="" />
   </interface>
   <script type="text/brightscript" uri="pkg:/source/utils/misc.brs" />