From 842ff4e4f16d2a96f346046d06b9187e0d0c895c Mon Sep 17 00:00:00 2001
From: jurialmunkey <jurialmunkey@kodi.tv>
Date: Wed, 20 Oct 2021 14:10:23 +1100
Subject: [PATCH] Widget fixes - allow background setting for None widget,
 restore submenu widget functionality, allow renaming fallbackwidget

---
 16x9/DialogSelect.xml  | 4 ++++
 16x9/Includes_Defs.xml | 1 +
 16x9/SkinSettings.xml  | 1 +
 addon.xml              | 2 +-
 shortcuts/template.xml | 4 ++--
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/16x9/DialogSelect.xml b/16x9/DialogSelect.xml
index 0881bdd8..80ad1b32 100644
--- a/16x9/DialogSelect.xml
+++ b/16x9/DialogSelect.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">3</defaultcontrol>
+    <onunload condition="!String.IsEmpty(Window(Home).Property(home.fallbackwidget.name)) + !String.IsEqual(Skin.String(home.fallbackwidget.name),Window(Home).Property(home.fallbackwidget.name))">Skin.SetString(home.fallbackwidget.name)</onunload>
+    <onunload condition="!String.IsEmpty(Window(Home).Property(home.fallbackwidget.name)) + !String.IsEqual(Skin.String(home.fallbackwidget.name),Window(Home).Property(home.fallbackwidget.name))">ClearProperty(home.fallbackwidget.name,home)</onunload>
     <controls>
         <include>GlobalOverlay</include>
         <include  condition="![Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation)]">Dialog_Select</include>
         <include  condition="Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation)">Dialog_Select_Game</include>
 
+
+
         <!-- Hidden Label -->
         <control type="label" id="1"><visible>false</visible><font /></control>
     </controls>
diff --git a/16x9/Includes_Defs.xml b/16x9/Includes_Defs.xml
index d1e1016a..0e8fbc0a 100644
--- a/16x9/Includes_Defs.xml
+++ b/16x9/Includes_Defs.xml
@@ -468,6 +468,7 @@
         </control>
     </include>
     <variable name="Defs_HomeWidget_Content">
+        <value condition="String.IsEmpty(Container(9000).ListItem.Property(widget)) + !String.IsEmpty(Container(9000).ListItem.Property(background))">-</value>
         <value condition="String.IsEqual(Container(9000).ListItem.Property(widget),Weather) + System.HasAddon(resource.images.weatherfanart.multi)">$INFO[Window(Weather).Property(Current.FanartCode),resource://resource.images.weatherfanart.multi/,]/</value>
         <value condition="[String.IsEqual(Skin.String(home.fallbackwidget),Weather) | String.IsEqual(Skin.String(home.fallbackwidget.node),Weather)] + System.HasAddon(resource.images.weatherfanart.multi)">$INFO[Window(Weather).Property(Current.FanartCode),resource://resource.images.weatherfanart.multi/,]/</value>
         <value condition="!String.IsEmpty(Skin.String(home.fallbackwidget))">$INFO[Skin.String(home.fallbackwidget)]</value>
diff --git a/16x9/SkinSettings.xml b/16x9/SkinSettings.xml
index f250266d..d0b6f650 100644
--- a/16x9/SkinSettings.xml
+++ b/16x9/SkinSettings.xml
@@ -179,6 +179,7 @@
                             <width>100%</width>
                             <label>31147</label>
                             <label2>$VAR[Label_SkinSetting_FallbackWidget]</label2>
+                            <onclick>SetProperty(home.fallbackwidget.name,$INFO[Skin.String(home.fallbackwidget.name)],home)</onclick>
                             <onclick>RunScript(script.skinshortcuts,type=widgets&amp;grouping=widget&amp;skinWidgetPath=home.fallbackwidget&amp;skinWidget=home.fallbackwidget.node&amp;skinWidgetName=home.fallbackwidget.name&amp;skinWidgetType=home.fallbackwidget.type&amp;skinWidgetTarget=home.fallbackwidget.target)</onclick>
                             <height>72</height>
                             <include>Defs_OptionButton</include>
diff --git a/addon.xml b/addon.xml
index ef758a6f..2d6d928a 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.eminence.2" name="Eminence" provider-name="jurialmunkey" version="4.1.14">
+<addon id="skin.eminence.2" name="Eminence" provider-name="jurialmunkey" version="4.1.15">
     <requires>
         <import addon="xbmc.gui" version="5.15.0" />
         <import addon="script.skinshortcuts" version="1.0.0" />
diff --git a/shortcuts/template.xml b/shortcuts/template.xml
index 51061983..81ab228f 100644
--- a/shortcuts/template.xml
+++ b/shortcuts/template.xml
@@ -8,7 +8,7 @@
         <property name="isWeather">False</property>
         <controls>
             <control type="wraplist" id="9001">
-                <visible>Integer.IsEqual(Window(Home).Property(MenuFocus),9002) + !String.IsEmpty(Container(9002).ListItem.Property(widgetType))</visible>
+                <visible>Integer.IsEqual(Window(Home).Property(MenuFocus),9002) + !String.IsEmpty(Container(9002).ListItem.Property(widget))</visible>
                 <skinshortcuts>visibility</skinshortcuts>
                 <visible>!Player.HasVideo | [Player.HasVideo + !Skin.HasSetting(background.showvideo)]</visible>
                 <orientation>horizontal</orientation>
@@ -42,7 +42,7 @@
         <property name="isWeather">False</property>
         <controls>
             <control type="wraplist" id="9001">
-                <visible>!Integer.IsEqual(Window(Home).Property(MenuFocus),9002) | String.IsEmpty(Container(9002).ListItem.Property(widgetType))</visible>
+                <visible>!Integer.IsEqual(Window(Home).Property(MenuFocus),9002) | String.IsEmpty(Container(9002).ListItem.Property(widget))</visible>
                 <skinshortcuts>visibility</skinshortcuts>
                 <visible>!Player.HasVideo | [Player.HasVideo + !Skin.HasSetting(background.showvideo)]</visible>
                 <orientation>horizontal</orientation>