From 73421ee9a6ffb79205814ea43890cbc4159f083b Mon Sep 17 00:00:00 2001
From: linknetx <altx@linknetmail.com>
Date: Sat, 4 Mar 2017 07:44:49 +0000
Subject: [PATCH] TopBar strings not truncated correctly by auto-width

For non-concatenated topbar strings each part of the string is truncated
seperately by auto-width resulting in incorrect truncation. Also auto
width not working unless the width is specified.

Solution - create vars to concatenate topbar strings prior to auto-width
truncation and specify width value for auto-width.
---
 xml/Includes.xml              |  4 ++--
 xml/MyMusicNav.xml            |  2 +-
 xml/MyMusicPlaylistEditor.xml |  2 +-
 xml/MyPics.xml                |  2 +-
 xml/Variables.xml             | 13 +++++++++++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/xml/Includes.xml b/xml/Includes.xml
index 9d297c84a9..fac8474687 100644
--- a/xml/Includes.xml
+++ b/xml/Includes.xml
@@ -870,7 +870,7 @@
 						<label>$INFO[Container.FolderName, / ]</label>
 						<include>BreadcrumbsLabel</include>
 						<visible>![Container.Content() + Window.IsActive(videos)]</visible>
-						<visible>![Window.IsActive(MyPVRChannels.xml) | Window.IsActive(MyPVRTimers.xml) | Window.IsActive(MyPVRRecordings.xml) | Window.IsActive(MyPVRSearch.xml)]</visible>
+						<visible>![Window.IsActive(MyMusicPlaylistEditor.xml) | Window.IsActive(MyPics.xml) | Window.IsActive(MyMusicNav.xml) | Window.IsActive(MyPVRChannels.xml) | Window.IsActive(MyPVRTimers.xml) | Window.IsActive(MyPVRRecordings.xml) | Window.IsActive(MyPVRSearch.xml)]</visible>
 					</control>
 					<control type="label">
 						<label>$INFO[Container.PluginCategory, / ]</label>
@@ -1043,7 +1043,7 @@
 		<shadowcolor>text_shadow</shadowcolor>
 		<top>7</top>
 		<height>100</height>
-		<width>auto</width>
+		<width min="1" max="900">auto</width>
 	</include>
 	<include name="ColoredBackgroundImages">
 		<control type="image">
diff --git a/xml/MyMusicNav.xml b/xml/MyMusicNav.xml
index 2b200bd554..3a85ab01dc 100644
--- a/xml/MyMusicNav.xml
+++ b/xml/MyMusicNav.xml
@@ -22,7 +22,7 @@
 				<include>ListThumbInfoPanel</include>
 			</control>
 			<include content="TopBar">
-				<param name="breadcrumbs_label" value="$LOCALIZE[2]" />
+				<param name="breadcrumbs_label" value="$VAR[BreadcrumbsMusicVar]" />
 			</include>
 			<include content="BottomBar">
 				<param name="info_visible" value="true" />
diff --git a/xml/MyMusicPlaylistEditor.xml b/xml/MyMusicPlaylistEditor.xml
index c7c6bcf6df..8ff16563d9 100644
--- a/xml/MyMusicPlaylistEditor.xml
+++ b/xml/MyMusicPlaylistEditor.xml
@@ -93,7 +93,7 @@
 			</control>
 		</control>
 		<include content="TopBar">
-			<param name="breadcrumbs_label" value="$LOCALIZE[10503][COLOR=button_focus][/COLOR]" />
+			<param name="breadcrumbs_label" value="$VAR[BreadcrumbsMusicPlaylistEditorVar]" />
 		</include>
 		<include>BottomBar</include>
 		<include content="BottomBarTwoListInfo">
diff --git a/xml/MyPics.xml b/xml/MyPics.xml
index f5edb426d6..ec026fb148 100644
--- a/xml/MyPics.xml
+++ b/xml/MyPics.xml
@@ -197,7 +197,7 @@
 				<include>ListThumbInfoPanel</include>
 			</control>
 			<include content="TopBar">
-				<param name="breadcrumbs_label" value="$LOCALIZE[1213]" />
+				<param name="breadcrumbs_label" value="$VAR[BreadcrumbsPicsVar]" />
 			</include>
 			<include content="BottomBar">
 				<param name="info_visible" value="true" />
diff --git a/xml/Variables.xml b/xml/Variables.xml
index 5127de1bed..a8fb19f33f 100644
--- a/xml/Variables.xml
+++ b/xml/Variables.xml
@@ -331,10 +331,19 @@
 		<value condition="Integer.IsGreater(ListItem.Playcount,0)">$INFO[ListItem.Overlay]</value>
 	</variable>
 	<!-- Breadcrumbs -->
+	<variable name="BreadcrumbsMusicPlaylistEditorVar">
+		<value>$LOCALIZE[10503] / $INFO[Container.FolderName]</value>
+	</variable>
+	<variable name="BreadcrumbsPicsVar">
+		<value>$LOCALIZE[1213] / $INFO[Container.FolderName]</value>
+	</variable>
+	<variable name="BreadcrumbsMusicVar">
+		<value>$LOCALIZE[2] / $INFO[Container.FolderName]</value>
+	</variable>
 	<variable name="BreadcrumbsVideoVar">
 		<value condition="Container.Content(movies) | String.StartsWith(container.folderpath,library://video/movies/) | String.StartsWith(container.folderpath,videodb://movies)">$LOCALIZE[20342]</value>
-		<value condition="Container.Content(musicvideos) | String.StartsWith(container.folderpath,library://video/musicvideos/) | String.StartsWith(container.folderpath,videodb://musicvideos)">$LOCALIZE[20389]</value>
-		<value condition="Container.Content(tvshows) | String.StartsWith(container.folderpath,library://video/tvshows/) | String.StartsWith(container.folderpath,videodb://tvshows)">$LOCALIZE[20343]</value>
+		<value condition="Container.Content(musicvideos) | String.StartsWith(container.folderpath,library://video/musicvideos/) | String.StartsWith(container.folderpath,videodb://musicvideos)">$LOCALIZE[20389] / $INFO[Container.FolderName]</value>
+		<value condition="Container.Content(tvshows) | String.StartsWith(container.folderpath,library://video/tvshows/) | String.StartsWith(container.folderpath,videodb://tvshows)">$LOCALIZE[20343] / $INFO[Container.FolderName]</value>
 		<value condition="Container.Content(seasons)">$LOCALIZE[20343]</value>
 		<value condition="Container.Content(episodes)">$LOCALIZE[20343]</value>
 		<value>$LOCALIZE[3]</value>