Resolve Conflicts
This commit is contained in:
parent
2e76997947
commit
2b52256b77
|
@ -1,7 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<component name="AlbumTrackList" extends="LabelList">
|
||||
<component name="AlbumTrackList" extends="MarkupList">
|
||||
<interface>
|
||||
<field id="MusicArtistAlbumData" type="assocarray" onChange="getData" />
|
||||
<field id="doneLoading" type="boolean" value="false"/>
|
||||
</interface>
|
||||
<script type="text/brightscript" uri="AlbumTrackList.brs" />
|
||||
</component>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<LayoutGroup id="infoGroup" layoutDirection="vert" itemSpacings="[15]">
|
||||
<Label id="overview" wrap="true" height="310" width="1250" ellipsisText=" ... (Press * to read more)" />
|
||||
<Rectangle id='songListRect' translation="[-30, 0]" width="1260" height="510" color="0x202020ff">
|
||||
<AlbumTrackList id="songList" translation="[45, 25]" itemSize="[1170,60]" numRows="7" />
|
||||
<AlbumTrackList itemComponentName="SongItem" id="songList" translation="[45, 25]" itemSize="[1170,60]" numRows="7" />
|
||||
</Rectangle>
|
||||
</LayoutGroup>
|
||||
</LayoutGroup>
|
||||
|
|
Loading…
Reference in New Issue
Block a user