From 8c6b29420be5033ab6697fc1cb37af820f7880c6 Mon Sep 17 00:00:00 2001
From: jurialmunkey <jurialmunkey@kodi.tv>
Date: Sun, 5 Jun 2022 19:12:54 +1000
Subject: [PATCH] fixes for combined view order and logo - fixes #19 #20

---
 1080i/Constants.xml      | 2 ++
 1080i/Info.xml           | 2 +-
 1080i/Views_Combined.xml | 3 ++-
 addon.xml                | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/1080i/Constants.xml b/1080i/Constants.xml
index 05959538..83075555 100644
--- a/1080i/Constants.xml
+++ b/1080i/Constants.xml
@@ -42,6 +42,8 @@
     <constant name="settings_radiobutton_textwidth">760</constant>
     <constant name="settings_slider_textwidth">560</constant>
 
+    <constant name="studio_logo_w">240</constant>
+
     <constant name="big_poster_w">704</constant>
     <constant name="-big_poster_w">-704</constant>
 
diff --git a/1080i/Info.xml b/1080i/Info.xml
index 2d08e17c..fd4bcd49 100644
--- a/1080i/Info.xml
+++ b/1080i/Info.xml
@@ -1230,7 +1230,7 @@
     <include name="Info_Studio">
         <control type="image">
             <right>0</right>
-            <width>200</width>
+            <width>studio_logo_w</width>
             <height>80</height>
             <aspectratio align="right">keep</aspectratio>
             <texture>$VAR[Image_CombinedStudio]</texture>
diff --git a/1080i/Views_Combined.xml b/1080i/Views_Combined.xml
index 9e1d25a2..9ba89d7e 100644
--- a/1080i/Views_Combined.xml
+++ b/1080i/Views_Combined.xml
@@ -44,6 +44,7 @@
                 <bottom>60</bottom>
                 <right>view_pad</right>
                 <height>80</height>
+                <width>studio_logo_w</width>
                 <aspectratio scalediffuse="false" align="right">keep</aspectratio>
                 <texture background="true">$VAR[Image_CombinedStudio]</texture>
             </control>
@@ -110,7 +111,7 @@
             <ondown>$PARAM[id]2</ondown>
             <onup>menu</onup>
             <visible>Container($PARAM[id]2).ListItem.IsFolder</visible>
-            <content target="videos">$INFO[Container($PARAM[id]2).ListItem.FolderPath]</content>
+            <content target="videos" sortby="episode" sortorder="ascending">$INFO[Container($PARAM[id]2).ListItem.FolderPath]</content>
             <visible>Control.IsVisible($PARAM[id]2)</visible>
             <onback>SetFocus($PARAM[id]2)</onback>
             <onfocus>SetProperty(TMDbHelper.WidgetContainer,$PARAM[id]3,Home)</onfocus>
diff --git a/addon.xml b/addon.xml
index 03fc037d..eb2f6015 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.3">
+<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.4">
     <requires>
         <import addon="xbmc.gui" version="5.15.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />