minor bug fixes

realcopacetic · Aug 15, 2024 · feff058 · feff058
1 parent 2e8122b
commit feff058
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 18 deletions.
diff --git a/16x9/Components_Buttons.xml b/16x9/Components_Buttons.xml
@@ -1056,6 +1056,21 @@
 		</definition>
 	</include>
 
+	<include name="Library_focused">
+		<param name="visible" default="true" />
+		<param name="color" default="$VAR[Breadcrumb_Label_Color]" />
+		<param name="width" default="60" />
+		<definition>
+			<include content="Texture_Button_Template">
+				<param name="visible" value="$PARAM[visible]" />
+				<param name="texture" value="icons/icon_library_focused_$PARAM[width].png" />
+				<param name="width" value="$PARAM[width]" />
+				<param name="color" value="$PARAM[color]" />
+				<nested />
+			</include>
+		</definition>
+	</include>
+
 	<include name="List_unfocused">
 		<param name="visible" default="true" />
 		<param name="color" default="$VAR[Breadcrumb_Label_Color]" />

diff --git a/16x9/Components_Viewtype_505_Grid.xml b/16x9/Components_Viewtype_505_Grid.xml
@@ -76,7 +76,7 @@
 		<param name="bottom_left" />
 		<definition>
 			<control type="group">
-				<visible>!$EXP[TransparentDialog_IsVisible] + !Window.IsVisible(pictureinfo) + !$EXP[Scrollbar_HasFocus] + !$EXP[Music_Player_HasFocus]</visible>
+				<visible>!$EXP[TransparentDialog_IsVisible] + !Window.IsVisible(pictureinfo) + !$EXP[Scrollbar_HasFocus] + !$EXP[Music_Player_HasFocus] + !Window.IsVisible(busydialog)</visible>
 				<include content="Visible_Fade_Animation" />
 				<!-- Left Side -->
 				<include content="DropShadow">
@@ -226,6 +226,13 @@
 						<include content="Icon_Component_Progress_Overlay" condition="Window.Is(home) | Window.Is(videos) | Window.Is(movieinformation)">
 							<param name="visible" value="[$EXP[GridView_Details_Off] | $EXP[GridView_Details_Breadcrumb]] + $EXP[Progress_IsVisible]" />
 						</include>
+						<!-- Artwork Mask -->
+						<control type="image">
+							<visible>![$EXP[GridView_Details_Off] | $EXP[GridView_Details_Breadcrumb] | $EXP[ListItem(0)_NowPlaying]] + !$EXP[TransparentDialog_IsVisible] + !Window.IsVisible(pictureinfo)</visible>
+							<include content="Visible_Fade_Delayed_Animation" />
+							<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_1x" tween="sine" easing="inout" reversible="false">Focus</animation>
+							<texture colordiffuse="$VAR[Grid_Mask]">views/white_100.png</texture>
+						</control>
 					</include>
 				</control>
 				<!-- Border -->
@@ -666,9 +673,6 @@
 				<width>$PARAM[width]</width>
 				<height>$PARAM[height]</height>
 				<visible>$EXP[GridView_Display_Is$PARAM[displaytype_label]] + [[$EXP[GridView_Details_On] + !$EXP[ListItem(0)_NowPlaying]] | $EXP[GridView_Widget_IsVisible]] + !Window.IsVisible(pictureinfo)</visible>
-				<control type="image">
-					<texture colordiffuse="$VAR[Grid_Mask]">views/white_100.png</texture>
-				</control>
 				<control type="grouplist">
 					<left>$PARAM[edge]</left>
 					<right>$PARAM[edge]</right>

diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml
@@ -623,7 +623,7 @@
 							<param name="color" value="$PARAM[title_color]" />
 							<param name="label" value="$PARAM[info_label]" />
 						</include>
-						<include content="Common_Details_Textbox" condition="Window.Is(videos) | Window.Is(music) | Window.Is(programs)">
+						<include content="Common_Details_Textbox" condition="Window.Is(addonbrowser) | Window.Is(music) | Window.Is(programs) | Window.Is(videos)">
 							<param name="visible" value="$EXP[$PARAM[viewtype_label]View_Details_Plot_IsVisible] + !String.IsEmpty(Control.GetLabel(6003)) + ![Control.HasFocus(3100) + Container.Content(tvshows)]" />
 							<param name="gap" value="60" />
 							<param name="maxheight" value="$PARAM[plot_maxheight]" />

diff --git a/16x9/Variables_Labels_Media.xml b/16x9/Variables_Labels_Media.xml
@@ -602,7 +602,6 @@
 		<value condition="!String.IsEmpty(ListItem.Plot)">$INFO[ListItem.Plot]</value>
 		<value condition="!String.IsEmpty(ListItem.AddonDescription)">$INFO[ListItem.AddonDescription]</value>
 		<value condition="!String.IsEmpty(ListItem.AddonSummary)">$INFO[ListItem.AddonSummary]</value>
-		<value />
 	</variable>
 
 	<variable name="PlotType_Label">

diff --git a/16x9/Viewtype_50_List.xml b/16x9/Viewtype_50_List.xml
@@ -45,7 +45,7 @@
 					<param name="visible" value="$EXP[ListView_Display_IsThumbnails] + !$EXP[PanelDialog_IsVisible] + !Window.Is(videoplaylist)" />
 					<param name="colordiffuse" value="$VAR[ListView_Panel_Mask]" />
 					<include content="Visible_Fade_Animation" />
-					<animation effect="zoom" start="60,180,1800,720" end="720,180,1140,720" time="0" condition="$EXP[Containers_Posters] | [!Window.Is(addonbrowser) + $EXP[Containers_Square]]">Conditional</animation>
+					<animation effect="zoom" start="60,180,1800,720" end="720,180,1140,720" time="0" condition="$EXP[Containers_Posters] | $EXP[Containers_Square]">Conditional</animation>
 				</include>
 				<include content="Artwork_Transition_Fade" condition="Window.Is(videos) | Window.Is(programs)">
 					<param name="visible" value="$EXP[ListView_Display_IsThumbnails] + $EXP[Containers_Posters]" />
@@ -54,22 +54,13 @@
 					<param name="art_icon" value="$PARAM[art_icon]" />
 					<param name="include_progress" value="true" />
 				</include>
-				<include content="Artwork_Transition_Fade" condition="Window.Is(videos) | Window.Is(music) | Window.Is(musicplaylist) | Window.Is(pictures)">
+				<include content="Artwork_Transition_Fade" condition="Window.Is(videos) | Window.Is(music) | Window.Is(musicplaylist) | Window.Is(pictures) | Window.Is(addonbrowser)">
 					<param name="visible" value="$EXP[ListView_Display_IsThumbnails] + $EXP[Containers_Square]" />
 					<param name="width" value="720" />
 					<param name="height" value="720" />
 					<param name="target_id" value="$PARAM[id]" />
 					<param name="art_icon" value="$PARAM[art_icon]" />
 				</include>
-				<include content="Artwork_Transition_Fade" condition="Window.Is(addonbrowser)">
-					<animation effect="slide" end="194,0" time="0" condition="true">Conditional</animation>
-					<param name="visible" value="$EXP[ListView_Display_IsThumbnails] + $EXP[Containers_Square]" />
-					<param name="width" value="512" />
-					<param name="height" value="512" />
-					<param name="target_id" value="$PARAM[id]" />
-					<param name="art_icon" value="$PARAM[art_icon]" />
-					<param name="aspectratio" value="center" />
-				</include>
 				<include content="Artwork_Transition_Fade" condition="Window.Is(videos)">
 					<param name="visible" value="$EXP[ListView_Display_IsThumbnails] + [Container.Content(videos) | Container.Content(episodes)]" />
 					<param name="width" value="720" />
@@ -129,6 +120,15 @@
 					<param name="info_label_visible" value="true" />
 					<param name="textcolor" value="$VAR[Breadcrumb_Label_Color]" />
 				</include>
+				<include content="Description_Label" condition="Window.Is(addonbrowser)">
+					<param name="type" value="textbox" />
+					<param name="label" value="$INFO[ListItem.AddonDescription]" />
+					<param name="left" value="120" />
+					<param name="right" value="120" />
+					<param name="bottom" value="40" />
+					<param name="height" value="100" />
+					<param name="font" value="LoginScreen_Info" />
+				</include>
 			</include>
 		</definition>
 	</include>

diff --git a/README.md b/README.md
@@ -20,6 +20,11 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 
 ### Changelog
 ---
+**2.6.3**
+- Fix for gridview artwork mask being on top of icons
+- Fix for accidental deletion of grid icon when a listitem is a collection
+- Added missing description label addonbrowser
+
 **2.6.2**
 - Minor improvements to visualisation
 - Minor improvements to design for MyPVRChannels.xml and MyPVRGuide.xml

diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.copacetic" version="2.6.2" name="Copacetic" provider-name="realcopacetic">
+<addon id="skin.copacetic" version="2.6.3" name="Copacetic" provider-name="realcopacetic">
 	<requires>
 		<import addon="xbmc.gui" version="5.17.0" />
 		<import addon="script.copacetic.helper" version="1.1.0" />