diff options
| author | Miguel Borges de Freitas <92enen@gmail.com> | 2023-03-04 16:29:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-04 16:29:49 +0000 |
| commit | 24eaa5e6b29e15edcd08b262228a65a55e304288 (patch) | |
| tree | ef6df30b3482c3a927646c0ea065a714d5eb5197 | |
| parent | c2e5a221b6ecfc8d22eba62987611d691ec50f19 (diff) | |
| parent | db8366c156a63b95b36222799748bdee38ca0124 (diff) | |
| download | xbmc-24eaa5e6b29e15edcd08b262228a65a55e304288.tar.xz | |
Merge pull request #22904 from enen92/backport_estuary_osd_bug
[backport][Skin][Estuary] Fix player settings adjustments if autoclose video osd is active
| -rw-r--r-- | addons/skin.estuary/xml/Custom_1101_SettingsList.xml | 2 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/Timers.xml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml index fa598cd366..24de2dcf5b 100644 --- a/addons/skin.estuary/xml/Custom_1101_SettingsList.xml +++ b/addons/skin.estuary/xml/Custom_1101_SettingsList.xml @@ -2,6 +2,8 @@ <window type="dialog" id="1101"> <defaultcontrol always="true">11000</defaultcontrol> <include>Animation_DialogPopupOpenClose</include> + <onunload>ClearProperty(settingslist_header,Home)</onunload> + <onunload>ClearProperty(settingslist_content,Home)</onunload> <controls> <control type="group"> <centerleft>50%</centerleft> diff --git a/addons/skin.estuary/xml/Timers.xml b/addons/skin.estuary/xml/Timers.xml index 88ec6bc33a..e9549dc9db 100644 --- a/addons/skin.estuary/xml/Timers.xml +++ b/addons/skin.estuary/xml/Timers.xml @@ -3,8 +3,8 @@ <timer> <name>autoclosevideoosd</name> <description>Timer to auto close the video OSD (if enabled in the skin settings)</description> - <start reset="true">Window.IsActive(videoosd) + Skin.HasSetting(OSDAutoClose)</start> - <reset>Window.IsActive(videoosd) + !System.IdleTime(1) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(autoclosevideoosd), 1)</reset> + <start reset="true">Window.IsActive(videoosd) + Skin.HasSetting(OSDAutoClose) + !String.IsEqual(window(home).Property(settingslist_content),osd) + !Window.IsActive(osdsubtitlesettings) + !Window.IsActive(osdaudiosettings) + !Window.IsActive(osdvideosettings) + !Window.IsActive(OSDCMSSettings)</start> + <reset>Window.IsActive(videoosd) + !System.IdleTime(1) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(autoclosevideoosd), 1) | String.IsEqual(window(home).Property(settingslist_content),osd) | Window.IsActive(osdsubtitlesettings) | Window.IsActive(osdaudiosettings) | Window.IsActive(osdvideosettings) | Window.IsActive(OSDCMSSettings)</reset> <stop>!Window.IsActive(videoosd) | String.IsEmpty(Skin.String(OSDAutoCloseTime)) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(autoclosevideoosd), 4) | !String.IsEmpty(Skin.String(OSDAutoCloseTime)) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(autoclosevideoosd),Skin.Numeric(OSDAutoCloseTime))</stop> <onstop>Dialog.Close(videoosd)</onstop> </timer> |