Fixed invisible setting dialog in filebrowser + cleanup

sualfred · Jul 19, 2018 · d80371b · d80371b
1 parent 2fce7a4
commit d80371b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 29 deletions.
diff --git a/xml/DialogMediaSource.xml b/xml/DialogMediaSource.xml
@@ -5,8 +5,11 @@
 	<controls>
 		<include content="DiffuseMask">
 			<param name="color">background_diffuse</param>
+			<param name="visible">Window.IsTopMost(DialogMediaSource.xml)</param>
 		</include>
 		<control type="grouplist">
+			<visible>Window.IsTopMost(DialogMediaSource.xml)</visible>
+			<include>Visible_PopupOpenClose</include>
 			<include>Dialog_PopupOpenClose</include>
 			<centerleft>50%</centerleft>
 			<centertop>50%</centertop>

diff --git a/xml/DialogNumeric.xml b/xml/DialogNumeric.xml
@@ -6,12 +6,10 @@
 	<include>PropertyIncludes</include>
 	<controls>
 		<!-- Background -->
-		<control type="image">
-			<include>Visible_Fade</include>
-			<include>FullscreenDimensions</include>
-			<texture colordiffuse="background_diffuse">common/white.jpg</texture>
-			<visible>!Window.IsVisible(virtualkeyboard)</visible>
-		</control>
+		<include content="DiffuseMask">
+			<param name="color">background_diffuse</param>
+			<param name="visible">!Window.IsVisible(virtualkeyboard)</param>
+		</include>
 		<!-- Control group -->
 		<control type="grouplist">
 			<include>Dialog_PopupOpenClose</include>

diff --git a/xml/DialogPictureInfo.xml b/xml/DialogPictureInfo.xml
@@ -3,11 +3,9 @@
 	<defaultcontrol always="true">100</defaultcontrol>
 	<include>PropertyIncludes</include>
 	<controls>
-		<control type="image">
-			<include>Visible_Fade</include>
-			<include>FullscreenDimensions</include>
-			<texture colordiffuse="background_diffuse">common/white.jpg</texture>
-		</control>
+		<include content="DiffuseMask">
+			<param name="color">background_diffuse</param>
+		</include>
 		<control type="scrollbar" id="3000">
 			<include>HiddenObject</include>
 		</control>

diff --git a/xml/DialogSettings.xml b/xml/DialogSettings.xml
@@ -3,20 +3,16 @@
 	<defaultcontrol always="true">5</defaultcontrol>
 	<include>PropertyIncludes</include>
 	<controls>
-		<control type="image">
-			<include>Visible_Fade</include>
-			<include>FullscreenDimensions</include>
-			<texture colordiffuse="background_diffuse">common/white.jpg</texture>
-			<visible>[VideoPlayer.IsFullscreen | Window.IsVisible(visualisation)] + !Window.IsVisible(DialogSlider.xml) + !Window.IsVisible(subtitlesearch) + !Window.IsVisible(filebrowser)</visible>
-		</control>
-		<control type="image">
-			<include>Visible_Fade</include>
-			<include>FullscreenDimensions</include>
-			<texture colordiffuse="background">common/white.jpg</texture>
-			<visible>!VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation) + !Window.IsVisible(DialogSlider.xml) + !Window.IsVisible(subtitlesearch) + !Window.IsVisible(filebrowser)</visible>
-		</control>
+		<include content="DiffuseMask">
+			<param name="color">background_diffuse</param>
+			<param name="visible">[VideoPlayer.IsFullscreen | Window.IsVisible(visualisation)] + Window.IsTopMost(DialogSettings.xml)</param>
+		</include>
+		<include content="DiffuseMask">
+			<param name="color">background</param>
+			<param name="visible">!VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation) + Window.IsTopMost(DialogSettings.xml)</param>
+		</include>
 		<control type="grouplist">
-			<visible>!Window.IsVisible(DialogSlider.xml) + !Window.IsVisible(selectdialog) + !Window.IsVisible(subtitlesearch) + !Window.IsVisible(filebrowser)</visible>
+			<visible>Window.IsTopMost(DialogSettings.xml)</visible>
 			<include>Visible_PopupOpenClose</include>
 			<include>Dialog_PopupOpenClose</include>
 			<centerleft>50%</centerleft>

diff --git a/xml/DialogTextViewer.xml b/xml/DialogTextViewer.xml
@@ -3,11 +3,9 @@
 	<defaultcontrol always="true">100</defaultcontrol>
 	<include>PropertyIncludes</include>
 	<controls>
-		<control type="image">
-			<include>Visible_Fade</include>
-			<include>FullscreenDimensions</include>
-			<texture colordiffuse="background_diffuse">common/white.jpg</texture>
-		</control>
+		<include content="DiffuseMask">
+			<param name="color">background_diffuse</param>
+		</include>
 		<control type="scrollbar" id="3000">
 			<include>HiddenObject</include>
 		</control>

diff --git a/xml/FileBrowser.xml b/xml/FileBrowser.xml
@@ -6,8 +6,11 @@
 	<controls>
 		<include content="DiffuseMask">
 			<param name="color">background_diffuse</param>
+			<param name="visible">Window.IsTopMost(FileBrowser.xml)</param>
 		</include>
 		<control type="grouplist">
+			<visible>Window.IsTopMost(FileBrowser.xml)</visible>
+			<include>Visible_PopupOpenClose</include>
 			<include>Dialog_PopupOpenClose</include>
 			<centerleft>50%</centerleft>
 			<centertop>50%</centertop>