Merge background overlay and media flags improvements

_replace Background1.png and Background2.png links by new background overlay
osmc · Feb 19, 2023 · beccfa3 · beccfa3
1 parent 888c6fe
commit beccfa3
Show file tree

Hide file tree

Showing 55 changed files with 811 additions and 828 deletions.
diff --git a/extras/debuggrid1440.png → extras/debug/debuggrid1440.png b/extras/debuggrid1440.png → extras/debug/debuggrid1440.png
diff --git a/extras/debuggrid1920.png → extras/debug/debuggrid1920.png b/extras/debuggrid1920.png → extras/debug/debuggrid1920.png
diff --git a/extras/debuggrid2560.png → extras/debug/debuggrid2560.png b/extras/debuggrid2560.png → extras/debug/debuggrid2560.png
diff --git a/media/Textures.xbt b/media/Textures.xbt
diff --git a/media/common/Background1.png b/media/common/Background1.png
diff --git a/media/common/Background1High.png b/media/common/Background1High.png
diff --git a/media/common/Background1Highest.png b/media/common/Background1Highest.png
diff --git a/media/common/Background1Low.png b/media/common/Background1Low.png
diff --git a/media/common/Background1Medium.png b/media/common/Background1Medium.png
diff --git a/media/common/Background2.png b/media/common/Background2.png
diff --git a/media/common/Background2High.png b/media/common/Background2High.png
diff --git a/media/common/Background2Highest.png b/media/common/Background2Highest.png
diff --git a/media/common/Background2Low.png b/media/common/Background2Low.png
diff --git a/media/common/Background2Medium.png b/media/common/Background2Medium.png
diff --git a/xml/Coordinates_Custom_Overlay_Debug.xml b/xml/Coordinates_Custom_Overlay_Debug.xml
@@ -8,16 +8,16 @@
 		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">Custom_Overlay_DebugGrid_4:3</include>
 	</include>
 	<include name="Custom_Overlay_DebugGrid_16:9">
-		<texture>special://skin/extras/debuggrid1920.png</texture>
+		<texture>special://skin/extras/debug/debuggrid1920.png</texture>
 	</include>
 	<include name="Custom_Overlay_DebugGrid_21:9">
-		<texture>special://skin/extras/debuggrid2560.png</texture>
+		<texture>special://skin/extras/debug/debuggrid2560.png</texture>
 	</include>
 	<include name="Custom_Overlay_DebugGrid_21:9_masked">
-		<texture>special://skin/extras/debuggrid2560.png</texture>
+		<texture>special://skin/extras/debug/debuggrid2560.png</texture>
 	</include>
 	<include name="Custom_Overlay_DebugGrid_4:3">
-		<texture>special://skin/extras/debuggrid1440.png</texture>
+		<texture>special://skin/extras/debug/debuggrid1440.png</texture>
 	</include>
 
 	<include name="Custom_Overlay_DebugGrid_coords">

diff --git a/xml/Coordinates_Includes_MediaFlags.xml b/xml/Coordinates_Includes_MediaFlags.xml
@@ -9,27 +9,27 @@
 	</include>
 	<include name="MediaFlags_coords1_16:9">
 		<left>120</left>
-		<bottom>52</bottom>
-		<width>400</width>
-		<height>96</height>
+		<bottom>48</bottom>
+		<width>530</width>
+		<height>100</height>
 	</include>
 	<include name="MediaFlags_coords1_21:9">
 		<left>120</left>
-		<bottom>52</bottom>
-		<width>400</width>
-		<height>96</height>
+		<bottom>48</bottom>
+		<width>530</width>
+		<height>100</height>
 	</include>
 	<include name="MediaFlags_coords1_21:9_masked">
 		<left>120</left>
-		<bottom>232</bottom>
-		<width>400</width>
-		<height>96</height>
+		<bottom>228</bottom>
+		<width>530</width>
+		<height>100</height>
 	</include>
 	<include name="MediaFlags_coords1_4:3">
 		<left>120</left>
-		<bottom>52</bottom>
-		<width>400</width>
-		<height>96</height>
+		<bottom>48</bottom>
+		<width>530</width>
+		<height>100</height>
 	</include>
 
 	<include name="MediaFlags_coords2">
@@ -108,52 +108,75 @@
 		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">MediaFlags_coords5_4:3</include>
 	</include>
 	<include name="MediaFlags_coords5_16:9">
+		<left>30</left>
+		<width>500</width>
+	</include>
+	<include name="MediaFlags_coords5_21:9">
+		<left>30</left>
+		<width>500</width>
+	</include>
+	<include name="MediaFlags_coords5_21:9_masked">
+		<left>30</left>
+		<width>500</width>
+	</include>
+	<include name="MediaFlags_coords5_4:3">
+		<left>30</left>
+		<width>500</width>
+	</include>
+
+	<include name="MediaFlags_coords6">
+		<include condition="$EXP[NonMaskedCoordinates]">MediaFlags_coords6_16:9</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,21:9)">MediaFlags_coords6_21:9</include>
+		<include condition="$EXP[MaskedCoordinates]">MediaFlags_coords6_21:9_masked</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">MediaFlags_coords6_4:3</include>
+	</include>
+	<include name="MediaFlags_coords6_16:9">
 		<top>2</top>
 		<left>-2</left>
 		<width>32</width>
 		<height>34</height>
 	</include>
-	<include name="MediaFlags_coords5_21:9">
+	<include name="MediaFlags_coords6_21:9">
 		<top>2</top>
 		<left>-2</left>
 		<width>32</width>
 		<height>34</height>
 	</include>
-	<include name="MediaFlags_coords5_21:9_masked">
+	<include name="MediaFlags_coords6_21:9_masked">
 		<top>2</top>
 		<left>-2</left>
 		<width>32</width>
 		<height>34</height>
 	</include>
-	<include name="MediaFlags_coords5_4:3">
+	<include name="MediaFlags_coords6_4:3">
 		<top>2</top>
 		<left>-2</left>
 		<width>32</width>
 		<height>34</height>
 	</include>
 
-	<include name="MediaFlags_coords6">
-		<include condition="$EXP[NonMaskedCoordinates]">MediaFlags_coords6_16:9</include>
-		<include condition="String.IsEqual(Skin.AspectRatio,21:9)">MediaFlags_coords6_21:9</include>
-		<include condition="$EXP[MaskedCoordinates]">MediaFlags_coords6_21:9_masked</include>
-		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">MediaFlags_coords6_4:3</include>
+	<include name="MediaFlags_coords7">
+		<include condition="$EXP[NonMaskedCoordinates]">MediaFlags_coords7_16:9</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,21:9)">MediaFlags_coords7_21:9</include>
+		<include condition="$EXP[MaskedCoordinates]">MediaFlags_coords7_21:9_masked</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">MediaFlags_coords7_4:3</include>
 	</include>
-	<include name="MediaFlags_coords6_16:9">
+	<include name="MediaFlags_coords7_16:9">
 		<top>6</top>
 		<width>30</width>
 		<height>26</height>
 	</include>
-	<include name="MediaFlags_coords6_21:9">
+	<include name="MediaFlags_coords7_21:9">
 		<top>6</top>
 		<width>30</width>
 		<height>26</height>
 	</include>
-	<include name="MediaFlags_coords6_21:9_masked">
+	<include name="MediaFlags_coords7_21:9_masked">
 		<top>6</top>
 		<width>30</width>
 		<height>26</height>
 	</include>
-	<include name="MediaFlags_coords6_4:3">
+	<include name="MediaFlags_coords7_4:3">
 		<top>6</top>
 		<width>30</width>
 		<height>26</height>